KDiff3: Difference between revisions

From KDE UserBase Wiki
(Features overview)
 
m (renewed link to handbook)
 
(13 intermediate revisions by 4 users not shown)
Line 1: Line 1:
{|style="text-align:center"
<languages />
|[[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 KIO,
 
::*has options to highlight or hide changes in white-space or comments,
 
::*supports Unicode, UTF-8 and other file encodings,


::*prints differences,
<!--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.


::*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:5-->
[https://docs.kde.org/stable5/en/kdiff3/kdiff3/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:Development]]
[[Category:File Management]]
</translate>

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.