KDiff3 – a diff and merge program
25개 이상의 토픽을 선택하실 수 없습니다. Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
Go to file
TDE Weblate 97fe01f400
Update translation files
4 일 전
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. 3 년 전
doc Replace Qt with TQt 1 개월 전
kdiff3plugin Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines 3 달 전
src Replace Qt with TQt 1 개월 전
translations Update translation files 4 일 전
AUTHORS Added abandoned KDE3 version of kdiff3 14 년 전
CMakeL10n.txt Use centralized cmake version 2 주 전
CMakeLists.txt Use centralized cmake version 2 주 전
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. 2 년 전
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