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, autodetection via byte-order-mark "BOM"
- supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.).
- Printing of differences.
- Manual alignment of lines.
- Automatic merging of version control history .
- and has an intuitive graphical user interface.
- Windows-Explorer integration Diff-Ext-for-KDiff3 - shell extension included in installer
- KDE-Konqueror service menu plugin.
- Simplified integration with IBM-Rational-Clearcase for Windows.
- Read what else is special in a short abstract (PDF).
- Comfortable Merge Of Two Or Three Input Files .
- Line-By-Line And Char-By-Char Diff-Viewer
- See White-Space Differences At One Glance.
- Analyze three files and see where they differ.
Supported platforms:
- GNU/Linux with KDE3
- MS-Windows
- Apple Mac OSX binary available
- In theory any platform for which Qt-libs work
learn more and free download
KDiff3.