KDiff3/en: Difference between revisions
(Importing a new version from external source) |
(Updating to match new version of source page) |
||
| Line 18: | Line 18: | ||
[https://docs.kde.org/trunk5/en/ | [https://docs.kde.org/trunk5/en/extragear-utils/kdiff3/index.html The KDiff3 Handbook] gives a detailed description of activities, in html form. | ||
[[Category:Utilities]] | [[Category:Utilities]] | ||
[[Category:Development]] | [[Category:Development]] | ||
[[Category:File Management]] | [[Category:File Management]] | ||
Revision as of 08:23, 24 July 2019
 |
A tool to check, edit and merge differences between 2 or 3 files |
Features
- 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 networktransparency 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.
The KDiff3 Handbook gives a detailed description of activities, in html form.