Merge branch 'mm/status-suggest-merge-abort' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:19 +0000 (11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:19 +0000 (11:55 -0700)
commit61efc5c...d81cbd8c9a5d145e1aab2f744772c856
tree8377ac1...f7319bf34d9f9a5869778c886b341a26copy hash to clipboard (tree)
parent00f27fe...6afaa9e5f91a0852a5a20c041ba0a421copy hash to clipboard (diff)
parentb0a61ab...3c0fd51a1b641b481e6a63f8661a8f9fcopy hash to clipboard (diff)
wt-status.c