KDiff3: Difference between revisions

From KDE UserBase Wiki
m (Found updated link for Handbook)
m (fix formatting)
Line 19: Line 19:
*prints differences,
*prints differences,
*supports version control keyword and history merging.
*supports version control keyword and history merging.
<!--T:5-->
[https://docs.kde.org/trunk5/en/kdereview/kdiff3/index.html The KDiff3 Handbook]''' gives a detailed description of activities, in html form.


<!--T:6-->
<!--T:6-->
Line 25: Line 29:
[[Category:File Management]]
[[Category:File Management]]
</translate>
</translate>
<!--T:5-->
[https://docs.kde.org/trunk5/en/kdereview/kdiff3/index.html The KDiff3 Handbook]''' gives a detailed description of activities, in html form.

Revision as of 14:10, 23 December 2018

  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.