Difference between revisions of "KDiff3"

Jump to: navigation, search
m (Fix address)
(formatting tweaks)
 
Line 22: Line 22:
  
 
<!--T:5-->
 
<!--T:5-->
[https://docs.kde.org/trunk5/en/extragear-utils/kdiff3/index.html The KDiff3 Handbook]''' gives a detailed description of activities, in html form.
+
[https://docs.kde.org/trunk5/en/extragear-utils/kdiff3/index.html The KDiff3 Handbook] gives a detailed description of activities, in html form.
  
 
<!--T:6-->
 
<!--T:6-->

Latest revision as of 10:27, 14 July 2019

Other languages:
Deutsch • ‎English • ‎dansk • ‎español • ‎français • ‎italiano • ‎română • ‎български • ‎русский • ‎українська • ‎中文(中国大陆)‎ • ‎中文(台灣)‎
Kdiff3 merge.png
  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.


This page was last edited on 14 July 2019, at 10:27. Content is available under Creative Commons License SA 4.0 unless otherwise noted.