kdiff3.sourceforge.net

     
Compares and merges 2 or 3 files or directories. The file diff shows changes within each line. For Unix and for Windows. Source available under GPL.
Alexa traffic report for KDIFF3.SOURCEFORGE.NET