Merge branch 'rt/cherry-pick-status'

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