KDiff3: Difference between revisions
(Features overview) |
m (Add Language Bar) |
||
| Line 1: | Line 1: | ||
{{Template:I18n/Language Navigation Bar|KDiff3}} | |||
{|style="text-align:center" | {|style="text-align:center" | ||
|[[Image:Kdiff3_merge.png|thumb|250px]]|| ||'''A tool to check, edit and merge differences between 2 or 3 files''' | |[[Image:Kdiff3_merge.png|thumb|250px]]|| ||'''A tool to check, edit and merge differences between 2 or 3 files''' | ||
Revision as of 20:28, 22 November 2008
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.