diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2016-07-21 14:58:37 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-22 10:20:27 -0700 |
| commit | b0a61ab23c0fd51a1b641b481e6a63f8661a8f9f (patch) | |
| tree | 125f6ea9494d20fa2e7a294540f3dac603c54688 /t/t7512-status-help.sh | |
| parent | e46579643d56162299b1756b70d418005351b256 (diff) | |
| download | git-b0a61ab23c0fd51a1b641b481e6a63f8661a8f9f.tar.gz | |
status: suggest 'git merge --abort' when appropriatemm/status-suggest-merge-abort
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 't/t7512-status-help.sh')
| -rwxr-xr-x | t/t7512-status-help.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 49d19a3b36..5c3db656df 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -29,6 +29,7 @@ test_expect_success 'status when conflicts unresolved' ' On branch conflicts You have unmerged paths. (fix conflicts and run "git commit") + (use "git merge --abort" to abort the merge) Unmerged paths: (use "git add <file>..." to mark resolution) |