diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-03 15:10:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-03 15:10:26 -0700 |
| commit | 5a2f4d3eef5c69ceb94bf25b7a1fb38a2af24921 (patch) | |
| tree | 5031ca6db0dc305c3bfffc69ff987103b5336b2c /t/t7512-status-help.sh | |
| parent | Merge branch 'jk/parse-options-concat' (diff) | |
| parent | status: suggest 'git merge --abort' when appropriate (diff) | |
| download | tgif-5a2f4d3eef5c69ceb94bf25b7a1fb38a2af24921.tar.xz | |
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/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) |