Andrew's git / gitweb.git / diff
?
Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Sep 2014 17:33:29 +0000 (10:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Sep 2014 17:33:30 +0000 (10:33 -0700)
* mm/discourage-commit-a-to-finish-conflict-resolution:
merge, pull: stop advising 'commit -a' in case of conflict

Trivial merge