Re: Trouble merging line-numbers branch into master

[Paul Eggert]

Presumably the lines in question were changed in one branch or the other (not 
necessarily by messing with white space), and our git settings are suggesting 
that you omit the spaces before tabs while you're futzing with those lines.

As build-aux/git-hooks/pre-commit suggests, you can work around the problem 
temporarily with the shell command 'git config core.whitespace -trailing-space'. 
I don't recommend this setting in general, though.