kde3-kdiff3

Feature-Rich Code Comparison Utility

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 comfortably solving merge conflicts * Supports KIO on KDE (allows accessing ftp, sftp, fish, smb, etc.) * Has an intuitive graphical user interface