Aller au contenu

KDiff3

Publié par KDE

A file and folder comparison and merge tool

Open sourceGPL-2.0-or-later

Certaines parties de cette page apparaissent dans la langue dans laquelle elles ont été écrites, car la traduction n'est pas terminée.

Points clés

  • Compares and merges up to three text files or directories simultaneously.
  • Highlights differences side by side with automatic conflict resolution options.
  • Provides an integrated text editor for manual merging and direct file saving.

À propos de cette application

KDiff3 is a utility designed for comparing and merging two or three text files or directories item by item. It displays differences side by side, highlighting matching lines, insertions, and deletions across the compared inputs. When conflicts arise during a three-way merge, the software attempts automatic resolution while presenting manual override options through a dedicated bottom pane. Users can edit the merged output directly within the application window before saving the final result to disk.

The program processes directory trees recursively, comparing file names, dates, and sizes to identify structural divergences. It runs natively on Linux environments and handles various text encodings and line-ending formats. The interface allows users to jump between unresolved conflicts quickly, customize color schemes for difference visualization, and print comparison reports or save them to disk for documentation purposes.

Linux

Nous n’hébergeons pas ce fichier, nous ne l’analysons pas et nous n’en inspectons pas le contenu. Lisez ce qu’en dit la source, puis décidez par vous-même.