git/git — pull request #104 by BertramScharpf (2014-08-21 11:35:56+00:00)
Title: Make hook "post-merge" more reliable.

In case of conflicts, the post-merge hook wasn't called
by "git merge" nor by the later "git commit" either.