I use WinMerge for that, unfortunately, as the name implies, Windows only.