IntelliJ decided to reformat the _entire file_ in a really wierd way - basically moving everything out of alignment, and creating a massive diff. I don't know why, but it was being really stubborn about it. So I decided to commit just one weirdly aligned line, instead of all of them.