KDiff3: Difference between revisions

From KDE UserBase Wiki
(Marked this version for translation)
m (renewed link to handbook)
 
(7 intermediate revisions by 4 users not shown)
Line 1: Line 1:
{{Template:I18n/Language Navigation Bar|KDiff3}}
<languages />
<languages />


Line 15: Line 14:
*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,
Line 21: Line 20:
*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]


<!--T:5-->
<!--T:5-->
[http://kdiff3.sourceforge.net/doc/index.html The KDiff3 Handbook]''' gives a detailed description of activities, in html form.
[https://docs.kde.org/stable5/en/kdiff3/kdiff3/index.html The KDiff3 Handbook] gives a detailed description of activities, in html form.


<!--T:6-->
<!--T:6-->

Latest revision as of 15:31, 4 September 2022

  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.


The KDiff3 Handbook gives a detailed description of activities, in html form.