Merge branch 'rj/tap-fix'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ee4c0a07aedb9c587879f7a7bbf1193a24cdd8a2..0492db924bb63b88a0e8d97cd29c60ae02fd8fcc 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1071,7 +1071,7 @@ _git_diff ()
 }
 
 __git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
-                       tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3
+                       tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
 "
 
 _git_difftool ()