If I understand correctly, this hook is only called by git commit, and the code in the example is run if this commit is a merge and it is succesful. But what I would like is a hook that would be run in case a git pull leads to unresolved conflicts...
– jubaApr 15 '11 at 10:17

1

Rereading, I think you're right. There may not be a hook run on unsuccessful pulls. Why not look at the exit status of git pull, in that case?
– user227667Apr 15 '11 at 11:23