From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 12 Jan 2013 00:49:01 +0000 (-0800)
Subject: Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maint
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b663af57c31cb6353bd86e39b880cc9602262958;p=git.git

Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maint

"git merge" started calling prepare-commit-msg hook like "git
commit" does some time ago, but forgot to pay attention to the exit
status of the hook.

* ap/merge-stop-at-prepare-commit-msg-failure:
  merge: Honor prepare-commit-msg return code
---

b663af57c31cb6353bd86e39b880cc9602262958