Download

KDiff3 is a graphical text difference analyzer for up to 3 input files, provides character-by-character analysis and a text merge tool with integrated editor. It can also compare and merge directories. Platform-independant.

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 ($Log$),
* and has an intuitive graphical user interface.
* Windows-Explorer integration Diff-Ext-for-KDiff3 - shell extension included in installer (originally by Sergey Zorin: see also Diff Ext)
* KDE-Konqueror service menu plugin
* Simplified integration with IBM-Rational-Clearcase for Windows (Details).
* Read what else is special in a short abstract (PDF).

Comfortable Merge Of Two Or Three Input Files

KDiff3 can be used to merge two or three input files and automatically merges as much as possible. The result is presented in an editable window where most conflicts can be solved with a single mouseclick: Select the buttons A/B/C from the button-bar to select the source that should be used. You can also select more than one source. Since this output window is an editor even conflicts which need further corrections can be solved here without requiring another tool.

And ...

* Fast navigation via buttons.
* A mouse-click into a summary column sync's all windows to show the same position.
* Select and copy from any window and paste into the merge result window.
* Overview column that shows where the changes and conflicts are.
* The colors are adjustable to your specific preferences.
* Adjustable Tab size.
* Option to insert spaces instead of tabs.
* Open files comfortably via dialog or specify files on the command line.
* Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)
* Show the line numbers for each line.
* Paste clipboard or drag text into a diff input window.
* Networktransparency via KIO.
* Can be used as diff-viewer in KDevelop 3.
* Word-wrap for long lines.
* Support for Unicode, UTF-8 and other codecs.
* Support for right to left languages.

New Features:

# KDiff3FileItemActionPlugin : Context menu that also works in Dolphin (for KDE>=4.6)
# Detect encoding specified in xml header or html "meta" tag.
# Warn if conversion errors appear (Invalid characters due to wrong encoding).
# Translation update.