KDiff3 – a diff and merge program
Você não pode selecionar mais de 25 tópicos Os tópicos devem começar com uma letra ou um número, podem incluir traços ('-') e podem ter até 35 caracteres.
 
 
 
Ir para arquivo
Andrei Stepanov ac9e1fb170
Translated using Weblate (Russian)
9 horas atrás
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. 3 anos atrás
doc Replace Qt with TQt 2 meses atrás
kdiff3plugin Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines 4 meses atrás
src Replace Qt with TQt 2 meses atrás
translations Translated using Weblate (Russian) 9 horas atrás
AUTHORS Added abandoned KDE3 version of kdiff3 14 anos atrás
CMakeL10n.txt Use centralized cmake version 1 mês atrás
CMakeLists.txt Use centralized cmake version 1 mês atrás
COPYING Added abandoned KDE3 version of kdiff3 14 anos atrás
ChangeLog Additional k => tde renaming and fixes 11 anos atrás
ConfigureChecks.cmake conversion to the cmake building system 5 anos atrás
Doxyfile Added abandoned KDE3 version of kdiff3 14 anos atrás
INSTALL Drop automake build support. 4 anos atrás
README.md Change README to markdown format. 3 anos atrás
TODO Added abandoned KDE3 version of kdiff3 14 anos atrás
config.h.cmake conversion to the cmake building system 5 anos atrás

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