KDiff3 – a diff and merge program
Je kunt niet meer dan 25 onderwerpen selecteren Onderwerpen moeten beginnen met een letter of nummer, kunnen streepjes bevatten ('-') en kunnen maximaal 35 tekens lang zijn.
 
 
 
Go to file
TDE Weblate 97fe01f400
Update translation files
1 maand geleden
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. 3 jaren geleden
doc Replace Qt with TQt 2 maanden geleden
kdiff3plugin Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines 4 maanden geleden
src Replace Qt with TQt 2 maanden geleden
translations Update translation files 1 maand geleden
AUTHORS Added abandoned KDE3 version of kdiff3 14 jaren geleden
CMakeL10n.txt Use centralized cmake version 1 maand geleden
CMakeLists.txt Use centralized cmake version 1 maand geleden
COPYING Added abandoned KDE3 version of kdiff3 14 jaren geleden
ChangeLog Additional k => tde renaming and fixes 11 jaren geleden
ConfigureChecks.cmake conversion to the cmake building system 5 jaren geleden
Doxyfile Added abandoned KDE3 version of kdiff3 14 jaren geleden
INSTALL Drop automake build support. 4 jaren geleden
README.md Change README to markdown format. 3 jaren geleden
TODO Added abandoned KDE3 version of kdiff3 14 jaren geleden
config.h.cmake conversion to the cmake building system 5 jaren geleden

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