contrib/completion: add smerge to the mergetool completion candidates
Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
Apr 4, 2019 at 00:34 UTC
f57b2ae348950c0048f0091093f9d1e095d11d08
1 file changed
+2
-1
contrib/completion/git-completion.bash
+2
-1
@@ -1501,7 +1501,8 @@ _git_diff ()
1501
}
1502
1503
__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
1504
- tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
1504
+ tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
1505
+ codecompare smerge
1506
"
1507
1508
_git_difftool ()