KDiff3 - cool tool
KDiff3 is a program that
- Compares or merges two or three text input files or directories
- Shows the differences line by line and character by character (!)
- provides an automatic merge-facility and an integrated editor for
comfortable solving of merge-conflicts - Supports Unicode, UTF-8 and other codecs
- Supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.)
- Has an intuitive graphical user interface
- Free
[Via Darrell Norton's Blog ]
