mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contrib/completion: add smerge to the mergetool completion candidates

Browse Source 
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar
2019-04-04 00:34:39 -07:00
committed by Junio C Hamano
parent eb12adc74c
commit f57b2ae348
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/completion/git-completion.bash
View File

@ -1501,7 +1501,8 @@ _git_diff ()
} }
__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
codecompare smerge
" "
_git_difftool () _git_difftool ()