merge: Honor prepare-commit-msg return code
authorAntoine Pelisse <apelisse@gmail.com>
Wed, 2 Jan 2013 18:42:50 +0000 (19:42 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Jan 2013 17:10:11 +0000 (09:10 -0800)
commit3e4141d...8c8dc1964d53c2ce13de8876d29e6436
tree44211fc...71d585ac9ab7700d48c4f7e31baa322dcopy hash to clipboard (tree)
parent1599999...fbda60552742275570947431b57108aecopy hash to clipboard (diff)
builtin/merge.c
t/t7505-prepare-commit-msg-hook.sh