TIL about `git merge -Xignore-all-space` and it saved me hours of time.
Also, there is a special circle of hell reserved for people who intermingle functional changes with cosmetic changes like, say, changing all tabs into spaces. ?
