| commit | b0a61ab23c0fd51a1b641b481e6a63f8661a8f9f | |
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | |
| Thu, 21 Jul 2016 12:58:37 +0000 (21 14:58 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jul 2016 17:20:27 +0000 (22 10:20 -0700) | ||
| tree | 125f6ea9494d20fa2e7a294540f3dac603c54688 | treesnapshot (tar.gz zip) |
| parent | e46579643d56162299b1756b70d418005351b256 | commitdiff |
status: suggest 'git merge --abort' when appropriate
We already suggest 'git rebase --abort' during a conflicted rebase.
Similarly, suggest 'git merge --abort' during conflict resolution on
'git merge'.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We already suggest 'git rebase --abort' during a conflicted rebase.
Similarly, suggest 'git merge --abort' during conflict resolution on
'git merge'.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7060-wtstatus.sh | diffblobblamehistory | |
| t/t7512-status-help.sh | diffblobblamehistory | |
| wt-status.c | diffblobblamehistory |