diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-03 22:10:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-03 22:10:26 (GMT) |
| commit | 5a2f4d3eef5c69ceb94bf25b7a1fb38a2af24921 (patch) | |
| tree | 5031ca6db0dc305c3bfffc69ff987103b5336b2c /t | |
| parent | d083d420b7d24a57cfd32af71100ae4c887f3a39 (diff) | |
| parent | b0a61ab23c0fd51a1b641b481e6a63f8661a8f9f (diff) | |
| download | git-5a2f4d3eef5c69ceb94bf25b7a1fb38a2af24921.zip git-5a2f4d3eef5c69ceb94bf25b7a1fb38a2af24921.tar.gz git-5a2f4d3eef5c69ceb94bf25b7a1fb38a2af24921.tar.bz2 | |
Merge branch 'mm/status-suggest-merge-abort'
"git status" learned to suggest "merge --abort" during a conflicted
merge, just like it already suggests "rebase --abort" during a
conflicted rebase.
* mm/status-suggest-merge-abort:
status: suggest 'git merge --abort' when appropriate
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7060-wtstatus.sh | 4 | ||||
| -rwxr-xr-x | t/t7512-status-help.sh | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 44bf1d8..4d17363 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: diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 49d19a3..5c3db65 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) |