KDiff3: Difference between revisions
m (Add Language Bar) |
m (added link to glossary#KIO) |
||
Line 13: | Line 13: | ||
::*has an editor for comfortable solving of merge-conflicts, | ::*has an editor for comfortable solving of merge-conflicts, | ||
::*provides networktransparency via KIO, | ::*provides networktransparency via [[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, |
Revision as of 06:50, 18 September 2009
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.