Browse Source
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>maint
Martin von Zweigbergk
14 years ago
committed by
Junio C Hamano
1 changed files with 1 additions and 1 deletions
Loading…
Reference in new issue