Skip to content

Commit

Permalink
rebase -m: don't print exit code 2 when merge fails
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Martin von Zweigbergk authored and gitster committed Feb 10, 2011
1 parent b3e4847 commit b325680
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-rebase--merge.sh
Expand Up @@ -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"
;;
*)
Expand Down

0 comments on commit b325680

Please sign in to comment.