KDiff3/de: Difference between revisions

From KDE Wiki Sandbox
(Created page with ''''Ein Werkzeug, um Unterschiede zwischen zwei oder drei Dateien zu überprüfen, sie zu bearbeiten und zusammen zu führen'''')
 
(Created page with '==Funktionen==')
Line 6: Line 6:
|}
|}


==Features==
==Funktionen==


*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 17:08, 21 September 2010

Template:I18n/Language Navigation Bar

  Ein Werkzeug, um Unterschiede zwischen zwei oder drei Dateien zu überprüfen, sie zu bearbeiten und zusammen zu führen

Funktionen

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