At the risk of sounding like I work for them :-)). I Don't by the way (I'm just a big fan) try using "Beyond Compare" for diffing. its Also a piece of cake to integrate it with PSPad.
-- <http://forum.pspad.com/read.php?2,33044,33047> PSPad freeware editor http://www.pspad.com
