KDiff3: Difference between revisions

Revision as of 18:13, 21 September 2010

Other languages:

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.

@@ Line 1: / Line 1: @@
-{{Template:I18n/Language Navigation Bar|KDiff3}}
+<languages />
-{|style="text-align:center"
-|[[Image:Kdiff3_merge.png|thumb|250px]]||&nbsp;||'''A tool to check, edit and merge differences between 2 or 3 files'''
+{|class="tablecenter vertical-centered"
+|[[Image:Kdiff3_merge.png|thumb|250px]]||&nbsp;||<translate><!--T:1-->
+'''A tool to check, edit and merge differences between 2 or 3 files'''</translate>
 |}
-==Features==
+<translate>
-::*compares and merges two or three text input files or directories,
+==Features== <!--T:2-->
-::*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 [[Glossary#KIO|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.
+<!--T:3-->
+*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 [[Special:myLanguage/Glossary#KIO|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 '''[http://kdiff3.sourceforge.net/doc/screenshots.html the project's home pages]'''
+<!--T:4-->
+Screenshots showing merge operations are available on [http://kdiff3.sourceforge.net/doc/screenshots.html the project's home pages]
-'''[http://kdiff3.sourceforge.net/doc/index.html The KDiff3 Handbook]''' gives a detailed description of activities, in html form.
+<!--T:5-->
+[http://kdiff3.sourceforge.net/doc/index.html The KDiff3 Handbook]''' gives a detailed description of activities, in html form.
+<!--T:6-->
 [[Category:Utilities]]
 [[Category:Development]]
 [[Category:File Management]]
+</translate>