![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
| Tue, 28 Dec 2010 09:30:37 +0000 (10:30 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Dec 2010 23:05:16 +0000 (15:05 -0800) | ||
| commit | 25bd6cee6d0d158b846369de42d15157059e0992 | |
| tree | 33c8baf5dc1932094855e9460120899de09033dc | tree | snapshot |
| parent | 8e708ed146c93504cb89416aa50aafbb52d75aa0 | commit | diff |
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 | diff | blob | history |