KDiff3 – a diff and merge program
Non puoi selezionare più di 25 argomenti Gli argomenti devono iniziare con una lettera o un numero, possono includere trattini ('-') e possono essere lunghi fino a 35 caratteri.
 
 
 
Vai al file
TDE Weblate 97fe01f400
Update translation files
1 mese fa
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. 3 anni fa
doc Replace Qt with TQt 2 mesi fa
kdiff3plugin Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines 4 mesi fa
src Replace Qt with TQt 2 mesi fa
translations Update translation files 1 mese fa
AUTHORS Added abandoned KDE3 version of kdiff3 14 anni fa
CMakeL10n.txt Use centralized cmake version 1 mese fa
CMakeLists.txt Use centralized cmake version 1 mese fa
COPYING Added abandoned KDE3 version of kdiff3 14 anni fa
ChangeLog Additional k => tde renaming and fixes 11 anni fa
ConfigureChecks.cmake conversion to the cmake building system 5 anni fa
Doxyfile Added abandoned KDE3 version of kdiff3 14 anni fa
INSTALL Drop automake build support. 4 anni fa
README.md Change README to markdown format. 3 anni fa
TODO Added abandoned KDE3 version of kdiff3 14 anni fa
config.h.cmake conversion to the cmake building system 5 anni fa

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