KDiff3 – a diff and merge program
Nie możesz wybrać więcej, niż 25 tematów Tematy muszą się zaczynać od litery lub cyfry, mogą zawierać myślniki ('-') i mogą mieć do 35 znaków.
 
 
 
Go to file
TDE Weblate 97fe01f400
Update translation files
4 tygodni temu
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. 3 lat temu
doc Replace Qt with TQt 2 miesięcy temu
kdiff3plugin Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines 4 miesięcy temu
src Replace Qt with TQt 2 miesięcy temu
translations Update translation files 4 tygodni temu
AUTHORS Added abandoned KDE3 version of kdiff3 14 lat temu
CMakeL10n.txt Use centralized cmake version 1 miesiąc temu
CMakeLists.txt Use centralized cmake version 1 miesiąc temu
COPYING Added abandoned KDE3 version of kdiff3 14 lat temu
ChangeLog Additional k => tde renaming and fixes 11 lat temu
ConfigureChecks.cmake conversion to the cmake building system 5 lat temu
Doxyfile Added abandoned KDE3 version of kdiff3 14 lat temu
INSTALL Drop automake build support. 4 lat temu
README.md Change README to markdown format. 3 lat temu
TODO Added abandoned KDE3 version of kdiff3 14 lat temu
config.h.cmake conversion to the cmake building system 5 lat temu

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