blob: 1f52a00e29ebfdd8aa222fdba96568a28f901bc5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
|
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.
|
