KDiff3/es: Difference between revisions

From KDE UserBase Wiki
(update translation, spanish)
(Updating to match new version of source page)
Line 1: Line 1:
{{Template:I18n/Language Navigation Bar|KDiff3}}
<languages />
<languages />



Revision as of 18:13, 21 September 2010

  Una herramienta para comprobar, editar y combinar las diferencias entre 2 o 3 archivos

Características

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