KDiff3 – a diff and merge program
選択できるのは25トピックまでです。 トピックは、先頭が英数字で、英数字とダッシュ('-')を使用した35文字以内のものにしてください。
ファイルへ移動
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