On Fri, Jul 7, 2017 at 11:51 AM Noam Postavsky <address@hidden
If you rerun './autogen git' in a checkout which includes [1:
e20ad44], the git hook should be updated such that it won't complain
about changes from merged commits anymore.
1: 2017-04-29 11:42:13 -0700 e20ad449deefa7470386bf99e05fd8c67227f678
Allow bypassing of some checks when merging
Soon after I emailed, I was able to get past that problem by committing the fix that removed those spaces in my local master and then restarting the merge.