post-commit hook shouldn't run when committing merge result

[Robin Stocker]

Just committed after a largish merge with conflicts, took a bit of time for the guilt calculation to finish.

Would be nice if it didn't guilt merge commits, at least not in the post-commit hook.