KDiff3 – a diff and merge program
Du kannst nicht mehr als 25 Themen auswählen Themen müssen entweder mit einem Buchstaben oder einer Ziffer beginnen. Sie können Bindestriche („-“) enthalten und bis zu 35 Zeichen lang sein.
 
 
 
Datei suchen
TDE Weblate 97fe01f400
Update translation files
vor 1 Monat
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. vor 3 Jahren
doc Replace Qt with TQt vor 2 Monaten
kdiff3plugin Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines vor 4 Monaten
src Replace Qt with TQt vor 2 Monaten
translations Update translation files vor 1 Monat
AUTHORS Added abandoned KDE3 version of kdiff3 vor 14 Jahren
CMakeL10n.txt Use centralized cmake version vor 1 Monat
CMakeLists.txt Use centralized cmake version vor 1 Monat
COPYING Added abandoned KDE3 version of kdiff3 vor 14 Jahren
ChangeLog Additional k => tde renaming and fixes vor 11 Jahren
ConfigureChecks.cmake conversion to the cmake building system vor 5 Jahren
Doxyfile Added abandoned KDE3 version of kdiff3 vor 14 Jahren
INSTALL Drop automake build support. vor 4 Jahren
README.md Change README to markdown format. vor 3 Jahren
TODO Added abandoned KDE3 version of kdiff3 vor 14 Jahren
config.h.cmake conversion to the cmake building system vor 5 Jahren

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