KDiff3: Difference between revisions
(Marked this version for translation) |
(Added Special:myLanguage) |
||
| Line 15: | Line 15: | ||
*provides an automatic merge-facility, | *provides an automatic merge-facility, | ||
*has an editor for comfortable solving of merge-conflicts, | *has an editor for comfortable solving of merge-conflicts, | ||
*provides networktransparency via [[Glossary#KIO|KIO]], | *provides networktransparency via [[Special:myLanguage/Glossary#KIO|KIO]], | ||
*has options to highlight or hide changes in white-space or comments, | *has options to highlight or hide changes in white-space or comments, | ||
*supports Unicode, UTF-8 and other file encodings, | *supports Unicode, UTF-8 and other file encodings, | ||
Revision as of 19:33, 9 September 2010
Template:I18n/Language Navigation Bar
 |
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.
Screenshots showing merge operations are available on the project's home pages
The KDiff3 Handbook gives a detailed description of activities, in html form.