Merge branch 'js/t5000-dont-copy-bin-sh'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8704451e52e9ed4239ec7a8e96d3fd8e6be4cb01..2fece98c603e24ed5ce08156e0e44199a149ba83 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1204,7 +1204,7 @@ _git_diff ()
 }
 
 __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
-                       tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
+                       tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
 "
 
 _git_difftool ()