Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 00:49:01 +0000 (11 16:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 00:49:01 +0000 (11 16:49 -0800)
"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

1  2 
builtin/merge.c

diff --cc builtin/merge.c
Simple merge