| commit | 89c7ae9c3bffe599b46a18a9a504fd3e28a9e715 | |
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
| Sun, 6 Feb 2011 18:43:49 +0000 (6 13:43 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Feb 2011 22:08:09 +0000 (10 14:08 -0800) | ||
| tree | b180de0a18d03ced2af1a331770487bf2ef61d5c | treesnapshot (tar.gz zip) |
| parent | 46df82d5fa0f83d3c1108ad70248877d6d9b56bb | commitdiff |
rebase: show consistent conflict resolution hint
When rebase stops due to conflict, interactive rebase currently
displays a different hint to the user than non-interactive rebase
does. Use the same message for both types of rebase.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When rebase stops due to conflict, interactive rebase currently
displays a different hint to the user than non-interactive rebase
does. Use the same message for both types of rebase.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory |