diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2016-07-21 15:58:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-22 20:20:27 +0300 |
| commit | b0a61ab23c0fd51a1b641b481e6a63f8661a8f9f (patch) | |
| tree | 125f6ea9494d20fa2e7a294540f3dac603c54688 /git-mergetool.sh | |
| parent | e46579643d56162299b1756b70d418005351b256 (diff) | |
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>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions