post-merge: Add it's not executed if merge failed.
post-merge: Add it's not executed if merge failed.

Signed-off-by: J��rg Sommer <f49f2a5e660787beb1d0033eaaa9f0d533955c60@alea.gnuu.de>
Signed-off-by: Junio C Hamano <a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com>

destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git