rebase -m: don't print exit code 2 when merge fails
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Sun, 6 Feb 2011 18:43:57 +0000 (13:43 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 22:08:09 +0000 (14:08 -0800)
When the merge strategy fails, a message suggesting the user to try
another strategy is displayed. Remove the "$rv" (which is always equal
to "2" in this case) from that message.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--merge.sh

index eb0f7bc1578fcbfbe6361bf5654a90582ba6a8ac..26afc75cc7d0fbf3de69325043130836c32454a0 100644 (file)
@@ -78,7 +78,7 @@ call_merge () {
                die "$resolvemsg"
                ;;
        2)
-               echo "Strategy: $rv $strategy failed, try another" 1>&2
+               echo "Strategy: $strategy failed, try another" 1>&2
                die "$resolvemsg"
                ;;
        *)