rebase -m: don't print exit code 2 when merge fails

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>

diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index 705d2f5475d784e35af4aa3819587f53c257fa69..4ea3ca738e7c010613da3787e6feec338dd18192 100644 (file)
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -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"
                ;;
        *)