Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make)

[martin rudalics]

> Perhaps we should change the hook so that it doesn't complain about
> problems from merges?

If it (a) solves the problem and (b) there is no strict policy wrt
whitespace commits, I'd strongly favor such a solution.

Thanks, martin