2019-11-03 03:19:16 +01:00
|
|
|
KDiff3 is a file and directory diff and merge tool which
|
2007-03-24 15:22:24 +01:00
|
|
|
|
2019-11-03 03:19:16 +01:00
|
|
|
* 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.
|
