diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 19:43:57 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-10 23:08:09 +0100 |
| commit | b325680930c007f87d35fdc60566b3441fedc7c3 (patch) | |
| tree | ea2a77944186f4996439a08783589247c339cedd /git-rebase--merge.sh | |
| parent | rebase -m: remember allow_rerere_autoupdate option (diff) | |
| download | git-b325680930c007f87d35fdc60566b3441fedc7c3.tar.xz git-b325680930c007f87d35fdc60566b3441fedc7c3.zip | |
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>
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | 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 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" ;; *) |