Walter Bright Mon, 01 Apr 2013 12:55:28 -0700
I use winmerge for Windows, and meld for Linux. They are both free, and work great.
What do you use?