Could you try to remove the unnecessary white space changes? This would make the diff easier to read and less noisy (I'm aware I can disable showing whitespace changes but they are still there).
Or we manage to convince @b4n to accept stripping trailing whitespace :).