It only pollutes your diffs if you're using a crappy diff tool. Whatever tool you use should have full control over showing leading, trailing, consecutive, or all whitespace differences.
It can:
git merge -X ignore-space-at-eolThere's no reason to use shitty tools here.