KDiff3/es: Difference between revisions
(Updating to match new version of source page) |
(Created page with 'Capturas de pantalla que muestran las operaciones de combinación están disponibles en [http://kdiff3.sourceforge.net/doc/screenshots.html las páginas del proyecto]') |
||
| Line 17: | Line 17: | ||
*supports version control keyword and history merging. | *supports version control keyword and history merging. | ||
Capturas de pantalla que muestran las operaciones de combinación están disponibles en [http://kdiff3.sourceforge.net/doc/screenshots.html las páginas del proyecto] | |||
[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. | ||
Revision as of 10:53, 24 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.
Capturas de pantalla que muestran las operaciones de combinación están disponibles en las páginas del proyecto
The KDiff3 Handbook gives a detailed description of activities, in html form.