diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 13:43:49 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-10 14:08:09 -0800 |
| commit | 89c7ae9c3bffe599b46a18a9a504fd3e28a9e715 (patch) | |
| tree | b180de0a18d03ced2af1a331770487bf2ef61d5c /git-gui/lib/commit.tcl | |
| parent | rebase: extract am code to new source file (diff) | |
| download | git-89c7ae9c3bffe599b46a18a9a504fd3e28a9e715.tar.gz git-89c7ae9c3bffe599b46a18a9a504fd3e28a9e715.zip | |
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>
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions