KDiff3 0.9.92

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. KDiff3 can also compare and merge directories.
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.
Main features:
- Fast navigation via buttons.
- A mouse-click into a summary column syncs 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.
- 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 KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
- and has an intuitive graphical user interface.
- Read what else is special in a short abstract (PDF).
Enhancements:
- KDE-Konqueror plugin: Launch KDiff3 from Konqueror. (Similar to Diff-Ext on Windows.)
- Qt4-version
- Printing crash fixed
- Compilation issue for Mac fixed
- Dir Rescan keeps settings for Show identical files etc.
- Bugfix: Empty file and not existing file were detected as binary equal.
- Temp file names use the process id in file name to allow several instances.
- Suppress flicker during startup. (Dont show status info window on creation.)
- New File comparison mode: Trust the size and date, but use binary comparison if date doesnt match (unsafe)
- After explicitely selecting files any file of the selected may be right clicked for context menu.
- Open dialog also shows current directories in directory comparison mode.
- Writing a file via --auto option didnt work for relative files. (Reported by Guilhem Bichot)
- New option for history merge: Max number of history entries
- New option "Auto save and quit on merge without conflicts"
- Directory Merge with Case sensitivity disabled: Correct destination filename chosen for merge.