KDiff3/da: Difference between revisions

From KDE UserBase Wiki
(Created page with ''''Et værktøj til at checke, redigere og sammenflette forskelle mellem 2 eller 3 filer'''')
 
(Created page with '==Hovedpunkter==')
Line 6: Line 6:
|}
|}


==Features==
==Hovedpunkter==


*compares and merges two or three text input files or directories,
*compares and merges two or three text input files or directories,

Revision as of 19:33, 9 September 2010

Template:I18n/Language Navigation Bar

  Et værktøj til at checke, redigere og sammenflette forskelle mellem 2 eller 3 filer

Hovedpunkter

  • 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.