mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-19 23:26:13 +02:00
Code

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>
This commit is contained in:
Martin von Zweigbergk 2011-02-06 13:43:57 -05:00 committed by Junio C Hamano
parent b3e4847e50
commit b325680930
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase--merge.sh
View File

@ -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"
;;
*)