Another vote for Poor Man's. But I think it's an important caveat that the whole team use the same formatter and the same settings. Otherwise diff's turn to u

Another vote for Poor Man's. But I think it's an important caveat that the whole team use the same formatter and the same settings. Otherwise diff's turn to useless noise* because Cubicle Bob has personalized his settings. *Yes, I've tried the Winmerge plugin. It's helpful but not ideal.