[PATCH v2 28/31] rebase -m: don't print exit code 2 when merge fails

From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Feb 6, 2011, 18:43 UTC
Message-ID: <1297017841-20678-29-git-send-email-martin.von.zweigbergk@gmail.com>
In-Reply-To: <1297017841-20678-1-git-send-email-martin.von.zweigbergk@gmail.com>

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>
---
 git-rebase--merge.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index eb0f7bc..26afc75 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"
 		;;
 	*)

-- 
1.7.4.rc2.33.g8a14f