If you're using Netbeans, make sure to set it up to [remove trailing whitespace on save](http://stackoverflow.com/questions/4119872/netbeans-removing-trailing-whitespace-on-save-and-tabs-to-spaces). This is a huge benefit to keep out useless whitespace diffs like this, which are absolutely terrible to manage when doing merges with conflicts.