Merge branch 'mh/maint-config-doc-proxy-command'

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index f730253c0eac181ec8507d2c837d4ec85a0ae991..54cb708254d38062983373c536589add648ae304 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -126,7 +126,7 @@ list_merge_tool_candidates () {
                else
                        tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
                fi
-               tools="$tools gvimdiff diffuse ecmerge p4merge araxis bc3"
+               tools="$tools gvimdiff diffuse ecmerge p4merge araxis bc3 codecompare"
        fi
        case "${VISUAL:-$EDITOR}" in
        *vim*)