KDiff3 – a diff and merge program
Vous ne pouvez pas sélectionner plus de 25 sujets Les noms de sujets doivent commencer par une lettre ou un nombre, peuvent contenir des tirets ('-') et peuvent comporter jusqu'à 35 caractères.
 
 
 
Go to file
TDE Weblate 97fe01f400
Update translation files
il y a 4 semaines
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. il y a 3 ans
doc Replace Qt with TQt il y a 2 mois
kdiff3plugin Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines il y a 4 mois
src Replace Qt with TQt il y a 2 mois
translations Update translation files il y a 4 semaines
AUTHORS Added abandoned KDE3 version of kdiff3 il y a 14 ans
CMakeL10n.txt Use centralized cmake version il y a 1 mois
CMakeLists.txt Use centralized cmake version il y a 1 mois
COPYING Added abandoned KDE3 version of kdiff3 il y a 14 ans
ChangeLog Additional k => tde renaming and fixes il y a 11 ans
ConfigureChecks.cmake conversion to the cmake building system il y a 5 ans
Doxyfile Added abandoned KDE3 version of kdiff3 il y a 14 ans
INSTALL Drop automake build support. il y a 4 ans
README.md Change README to markdown format. il y a 3 ans
TODO Added abandoned KDE3 version of kdiff3 il y a 14 ans
config.h.cmake conversion to the cmake building system il y a 5 ans

README.md

kdiff3 - a diff and merge program.

KDiff3 is a program that compares two or three input files and shows the differences line by line and character by character. It provides an automatic merge facility and an integrated editor for comfortable solving of merge conflicts.

KDiff3 allows recursive directory comparison and merging as well.

Included features:

  • compares and merges two or three input files or directories,
  • shows the differences line by line and character by character (!)
  • provides an automatic merge-facility and
  • has an integrated editor for comfortable solving of merge-conflicts
  • has support for TDE-TDEIO (ftp, sftp, http, fish, smb)
  • has an intuitive graphical user interface
  • has a Konqueror service menu plugin

.

Contributing

If you wish to contribute to kdiff3 (TDE), you might do so:

Translations status

messages

Translations status

plugin

Translations status

desktop files

Translations status