KDiff3 – a diff and merge program
No puede seleccionar más de 25 temas Los temas deben comenzar con una letra o número, pueden incluir guiones ('-') y pueden tener hasta 35 caracteres de largo.
 
 
 
Ir al archivo
TDE Weblate 97fe01f400
Update translation files
hace 1 mes
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. hace 3 años
doc Replace Qt with TQt hace 2 meses
kdiff3plugin Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines hace 4 meses
src Replace Qt with TQt hace 2 meses
translations Update translation files hace 1 mes
AUTHORS Added abandoned KDE3 version of kdiff3 hace 14 años
CMakeL10n.txt Use centralized cmake version hace 1 mes
CMakeLists.txt Use centralized cmake version hace 1 mes
COPYING Added abandoned KDE3 version of kdiff3 hace 14 años
ChangeLog Additional k => tde renaming and fixes hace 11 años
ConfigureChecks.cmake conversion to the cmake building system hace 5 años
Doxyfile Added abandoned KDE3 version of kdiff3 hace 14 años
INSTALL Drop automake build support. hace 4 años
README.md Change README to markdown format. hace 3 años
TODO Added abandoned KDE3 version of kdiff3 hace 14 años
config.h.cmake conversion to the cmake building system hace 5 años

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