From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Sun, 6 Feb 2011 18:43:57 +0000 (-0500)
Subject: rebase -m: don't print exit code 2 when merge fails
X-Git-Tag: v1.7.6-rc0~136^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b325680930c007f87d35fdc60566b3441fedc7c3;p=git.git

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 eb0f7bc15..26afc75cc 100644
--- 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"
 		;;
 	*)