KDiff3 – a diff and merge program
Du kan inte välja fler än 25 ämnen Ämnen måste starta med en bokstav eller siffra, kan innehålla bindestreck ('-') och vara max 35 tecken långa.
 
 
 
Go to file
TDE Weblate 97fe01f400
Update translation files
4 veckor sedan
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. 3 år sedan
doc Replace Qt with TQt 2 månader sedan
kdiff3plugin Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines 4 månader sedan
src Replace Qt with TQt 2 månader sedan
translations Update translation files 4 veckor sedan
AUTHORS Added abandoned KDE3 version of kdiff3 14 år sedan
CMakeL10n.txt Use centralized cmake version 1 månad sedan
CMakeLists.txt Use centralized cmake version 1 månad sedan
COPYING Added abandoned KDE3 version of kdiff3 14 år sedan
ChangeLog Additional k => tde renaming and fixes 11 år sedan
ConfigureChecks.cmake conversion to the cmake building system 5 år sedan
Doxyfile Added abandoned KDE3 version of kdiff3 14 år sedan
INSTALL Drop automake build support. 4 år sedan
README.md Change README to markdown format. 3 år sedan
TODO Added abandoned KDE3 version of kdiff3 14 år sedan
config.h.cmake conversion to the cmake building system 5 år sedan

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