Martin von Zweigbergk b325680930 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>

2011-02-10 14:08:09 -08:00

3.0 KiB

Raw Blame History

View Raw