Merge branch 'mm/status-suggest-merge-abort'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Aug 2016 22:10:26 +0000 (15:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Aug 2016 22:10:26 +0000 (15:10 -0700)
commit5a2f4d3eef5c69ceb94bf25b7a1fb38a2af24921
tree5031ca6db0dc305c3bfffc69ff987103b5336b2c
parentd083d420b7d24a57cfd32af71100ae4c887f3a39
parentb0a61ab23c0fd51a1b641b481e6a63f8661a8f9f
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
wt-status.c