summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-02-06 13:43:57 -0500
committerJunio C Hamano <gitster@pobox.com>2011-02-10 14:08:09 -0800
commitb325680930c007f87d35fdc60566b3441fedc7c3 (patch)
treeea2a77944186f4996439a08783589247c339cedd
parentb3e4847e50cf0ab3da4ad9664a5e4382e778ebd5 (diff)
downloadgit-b325680930c007f87d35fdc60566b3441fedc7c3.tar.gz
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>
-rw-r--r--git-rebase--merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index eb0f7bc157..26afc75cc7 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"
;;
*)