Merge branch 'jk/unused-params-even-more'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 93b5e972cb633fe6dd9009d05acbb7be0c976294..42a3c8e52417d42a255c68a4f6f24a1518bb3404 100644 (file)
--- 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 ()