From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Jan 2013 16:26:33 +0000 (-0800)
Subject: Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea12a7d6960c90dc0465a944b9e4426c8a972006;p=git.git

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

"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.  t7505 may want a general clean-up but that is
a different topic.

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

ea12a7d6960c90dc0465a944b9e4426c8a972006