9ae739ca00
Change log: [No change log entries for 1.8.1 available.] Version 1.8 - 2019-03-22 =========================== -Don't enable "Choose C for Everthing" on two way merge. -cleanup code. Version 1.7.90 - 2017-01-23 ============================ -ported to QT5/KDEFramework5 -require cmake 3.1 -abandonded Konqueror specific plugin no longer applicable. -kde4 support dropped due to extensive changes needed for QT5/KDEFramework5 -QT5 now required because of above changes. -bugfix: Show Indentical files setting not applied after rescan. -Change parameter errors to use dialog on Linux as well as console output. -Don't sort twice when sorting in reverse order. -fix memmory leak introduced in 0.9.91. -change version numbering. -scrap ClearCase support -implement Cut/Paste.
11 lines
572 B
Text
11 lines
572 B
Text
KDiff3 is a file and directory diff and merge tool which
|
|
|
|
* compares and merges two or three text input files or directories,
|
|
* shows the differences line by line and character by character(!),
|
|
* provides an automatic merge-facility,
|
|
* has an editor for comfortable solving of merge-conflicts,
|
|
* provides network transparency via KIO,
|
|
* has options to highlight or hide changes in white-space or comments,
|
|
* supports Unicode, UTF-8 and other file encodings,
|
|
* prints differences,
|
|
* supports version control keyword and history merging.
|