File Comparison

KDiff3

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.