From: David Aguilar Date: Thu, 4 Apr 2019 07:34:39 +0000 (-0700) Subject: contrib/completion: add smerge to the mergetool completion candidates X-Git-Tag: v2.22.0-rc0~77^2 X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=f57b2ae348950c0048f0091093f9d1e095d11d08;p=git.git contrib/completion: add smerge to the mergetool completion candidates Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 976e4a6548..b6d69bcaeb 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1501,7 +1501,8 @@ _git_diff () } __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 ()