KDiff3 – a diff and merge program
Вы не можете выбрать более 25 тем Темы должны начинаться с буквы или цифры, могут содержать дефисы(-) и должны содержать не более 35 символов.
Go to file
TDE Weblate 97fe01f400
Update translation files
1 месяц назад
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. 3 лет назад
doc Replace Qt with TQt 2 месяцев назад
kdiff3plugin Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines 4 месяцев назад
src Replace Qt with TQt 2 месяцев назад
translations Update translation files 1 месяц назад
AUTHORS Added abandoned KDE3 version of kdiff3 14 лет назад
CMakeL10n.txt Use centralized cmake version 1 месяц назад
CMakeLists.txt Use centralized cmake version 1 месяц назад
COPYING Added abandoned KDE3 version of kdiff3 14 лет назад
ChangeLog Additional k => tde renaming and fixes 11 лет назад
ConfigureChecks.cmake conversion to the cmake building system 5 лет назад
Doxyfile Added abandoned KDE3 version of kdiff3 14 лет назад
INSTALL Drop automake build support. 4 лет назад
README.md Change README to markdown format. 3 лет назад
TODO Added abandoned KDE3 version of kdiff3 14 лет назад
config.h.cmake conversion to the cmake building system 5 лет назад

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