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.