Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 6988f9c0c0492b2a623c62420509ef64654c0f1b..f013a0350665e8c11b52853b5794631dcf7694d0 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -162,7 +162,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*)