KDiff3 – a diff and merge program
25'ten fazla konu seçemezsiniz Konular bir harf veya rakamla başlamalı, kısa çizgiler ('-') içerebilir ve en fazla 35 karakter uzunluğunda olabilir.
 
 
 
Dosyaya git
TDE Weblate 97fe01f400
Update translation files
1 ay önce
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. 3 yıl önce
doc Replace Qt with TQt 2 ay önce
kdiff3plugin Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines 4 ay önce
src Replace Qt with TQt 2 ay önce
translations Update translation files 1 ay önce
AUTHORS Added abandoned KDE3 version of kdiff3 14 yıl önce
CMakeL10n.txt Use centralized cmake version 1 ay önce
CMakeLists.txt Use centralized cmake version 1 ay önce
COPYING Added abandoned KDE3 version of kdiff3 14 yıl önce
ChangeLog Additional k => tde renaming and fixes 11 yıl önce
ConfigureChecks.cmake conversion to the cmake building system 5 yıl önce
Doxyfile Added abandoned KDE3 version of kdiff3 14 yıl önce
INSTALL Drop automake build support. 4 yıl önce
README.md Change README to markdown format. 3 yıl önce
TODO Added abandoned KDE3 version of kdiff3 14 yıl önce
config.h.cmake conversion to the cmake building system 5 yıl önce

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