Merge branch 'jc/merge-bases'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ffedce751c80eac032843f6ecad50246cfc28035..222b804ce4d5314b7eaff73f51291cff3903662d 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 ()