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>
Martin von Zweigbergk committed
Feb 6, 2011 at 13:43 UTC
b325680930c007f87d35fdc60566b3441fedc7c3
1 file changed
+1
-1
git-rebase--merge.sh
+1
-1
@@ -78,7 +78,7 @@ call_merge () {
78
die "$resolvemsg"
79
;;
80
2)
81
- echo "Strategy: $rv $strategy failed, try another" 1>&2
81
+ echo "Strategy: $strategy failed, try another" 1>&2
82
die "$resolvemsg"
83
;;
84
*)