diff options
| author |  Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 13:43:57 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-02-10 14:08:09 -0800 |
| commit | b325680930c007f87d35fdc60566b3441fedc7c3 (patch) | |
| tree | ea2a77944186f4996439a08783589247c339cedd /git-rebase--am.sh | |
| parent | rebase -m: remember allow_rerere_autoupdate option (diff) | |
| download | tgif-b325680930c007f87d35fdc60566b3441fedc7c3.tar.xz | |
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--am.sh')
0 files changed, 0 insertions, 0 deletions