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/t7060-wtstatus.sh | |
parent | e46579643d56162299b1756b70d418005351b256 (diff) | |
download | git-b0a61ab23c0fd51a1b641b481e6a63f8661a8f9f.tar.gz git-b0a61ab23c0fd51a1b641b481e6a63f8661a8f9f.tar.xz |
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 't/t7060-wtstatus.sh')
-rwxr-xr-x | t/t7060-wtstatus.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 44bf1d84a..4d17363a9 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -34,6 +34,7 @@ test_expect_success 'M/D conflict does not segfault' ' On branch side You have unmerged paths. (fix conflicts and run "git commit") + (use "git merge --abort" to abort the merge) Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) @@ -138,6 +139,7 @@ test_expect_success 'status when conflicts with add and rm advice (deleted by th On branch master You have unmerged paths. (fix conflicts and run "git commit") + (use "git merge --abort" to abort the merge) Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) @@ -171,6 +173,7 @@ test_expect_success 'status when conflicts with add and rm advice (both deleted) On branch conflict_second You have unmerged paths. (fix conflicts and run "git commit") + (use "git merge --abort" to abort the merge) Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) @@ -195,6 +198,7 @@ test_expect_success 'status when conflicts with only rm advice (both deleted)' ' On branch conflict_second You have unmerged paths. (fix conflicts and run "git commit") + (use "git merge --abort" to abort the merge) Changes to be committed: |