KDiff3/es: Difference between revisions
(update translation, spanish) |
(update translation, spanish) |
||
| Line 22: | Line 22: | ||
[http://kdiff3.sourceforge.net/doc/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. | ||
[[Category:Utilidades]] | [[Category:Utilidades/es]] | ||
[[Category:Desarrollo/es]] | [[Category:Desarrollo/es]] | ||
[[Category:Administración de Archivos/es]] | [[Category:Administración de Archivos/es]] | ||
Revision as of 17:46, 17 September 2010
Template:I18n/Language Navigation Bar
 |
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.