Merge branch 'js/test-help-format-windows-port-fix'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 86f77345fdd7ed24d8c76ac33900ff65bdaa32fa..dba3c15700fae1ae8a7a43fd7a6ad7a5b9cbd5dd 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1188,7 +1188,7 @@ _git_diff ()
        __git_complete_revlist_file
 }
 
-__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
+__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
                        tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
 "