KDiff3 – a diff and merge program
Nevar pievienot vairāk kā 25 tēmas Tēmai ir jāsākas ar burtu vai ciparu, tā var saturēt domu zīmes ('-') un var būt līdz 35 simboliem gara.
 
 
 
Iet uz failu
TDE Weblate 97fe01f400
Update translation files
pirms 4 nedēļām
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. pirms 3 gadiem
doc Replace Qt with TQt pirms 2 mēnešiem
kdiff3plugin Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines pirms 4 mēnešiem
src Replace Qt with TQt pirms 2 mēnešiem
translations Update translation files pirms 4 nedēļām
AUTHORS Added abandoned KDE3 version of kdiff3 pirms 14 gadiem
CMakeL10n.txt Use centralized cmake version pirms 1 mēnesi
CMakeLists.txt Use centralized cmake version pirms 1 mēnesi
COPYING Added abandoned KDE3 version of kdiff3 pirms 14 gadiem
ChangeLog Additional k => tde renaming and fixes pirms 11 gadiem
ConfigureChecks.cmake conversion to the cmake building system pirms 5 gadiem
Doxyfile Added abandoned KDE3 version of kdiff3 pirms 14 gadiem
INSTALL Drop automake build support. pirms 4 gadiem
README.md Change README to markdown format. pirms 3 gadiem
TODO Added abandoned KDE3 version of kdiff3 pirms 14 gadiem
config.h.cmake conversion to the cmake building system pirms 5 gadiem

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