KDiff3: Difference between revisions
(Markup edit) |
(Marked this version for translation) |
||
| Line 3: | Line 3: | ||
{|class="tablecenter vertical-centered" | {|class="tablecenter vertical-centered" | ||
|[[Image:Kdiff3_merge.png|thumb|250px]]|| ||<translate>'''A tool to check, edit and merge differences between 2 or 3 files'''</translate> | |[[Image:Kdiff3_merge.png|thumb|250px]]|| ||<translate><!--T:1--> | ||
'''A tool to check, edit and merge differences between 2 or 3 files'''</translate> | |||
|} | |} | ||
<translate> | <translate> | ||
==Features== | ==Features== <!--T:2--> | ||
<!--T:3--> | |||
*compares and merges two or three text input files or directories, | *compares and merges two or three text input files or directories, | ||
*shows the differences line by line and character by character(!), | *shows the differences line by line and character by character(!), | ||
| Line 19: | Line 21: | ||
*supports version control keyword and history merging. | *supports version control keyword and history merging. | ||
<!--T:4--> | |||
Screenshots showing merge operations are available on [http://kdiff3.sourceforge.net/doc/screenshots.html the project's home pages] | Screenshots showing merge operations are available on [http://kdiff3.sourceforge.net/doc/screenshots.html the project's home pages] | ||
<!--T:5--> | |||
[http://kdiff3.sourceforge.net/doc/index.html The KDiff3 Handbook]''' gives a detailed description of activities, in html form. | [http://kdiff3.sourceforge.net/doc/index.html The KDiff3 Handbook]''' gives a detailed description of activities, in html form. | ||
<!--T:6--> | |||
[[Category:Utilities]] | [[Category:Utilities]] | ||
[[Category:Development]] | [[Category:Development]] | ||
[[Category:File Management]] | [[Category:File Management]] | ||
</translate> | </translate> | ||
Revision as of 18:08, 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.