Oops. I bought a fancy [3-way diff tool](http://www.kaleidoscopeapp.com/) which is super handy but seems to make me mess up indents.