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