From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Sep 2014 17:33:29 +0000 (-0700)
Subject: Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'
X-Git-Tag: v2.2.0-rc0~141
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=785514bb5544fbe2604ea657530134671f82e4b1;p=git-core%2Fgit.git

Merge branch 'mm/discourage-commit-a-to-finish-conflict-resolution'

* mm/discourage-commit-a-to-finish-conflict-resolution:
  merge, pull: stop advising 'commit -a' in case of conflict
---

785514bb5544fbe2604ea657530134671f82e4b1