DiffMerge from SourceGear is free and works great and is available for Windows, Mac and Linux
http://www.sourcegear.com/diffmerge/
Diff tool – DiffMerge free/open Win, Mac, Linux
November 14, 2008
Leave a Comment » | 
tools, utils, api, etc | 
Permalink
Posted by karthik
