| commit | 5a2f4d3eef5c69ceb94bf25b7a1fb38a2af24921 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Aug 2016 22:10:26 +0000 (3 15:10 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Aug 2016 22:10:26 +0000 (3 15:10 -0700) | ||
| tree | 5031ca6db0dc305c3bfffc69ff987103b5336b2c | treesnapshot (tar.gz zip) |
| parent | d083d420b7d24a57cfd32af71100ae4c887f3a39 | commitdiff |
| parent | b0a61ab23c0fd51a1b641b481e6a63f8661a8f9f | commitdiff |
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
"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
| wt-status.c | diff1 | diff2 | blobhistory |