KDiff3/fr
 |
Un outil pour vérifier, éditer et fusionner les différences entre 2 ou 3 fichiers |
Features
- 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.