KDiff3 – a diff and merge program
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
TDE Gitea 67735145b4 Reset submodule main/applications/kdiff3/cmake to latest HEAD 1 week ago
cmake @ 63b5532a29 Reset submodule main/applications/kdiff3/cmake to latest HEAD 1 week ago
diff_ext_for_kdiff3 Remove the original translation directory layout. 1 month ago
doc Add installation of png files for html documentation. 1 month ago
kdiff3plugin Desktop file translations: 1 month ago
src Desktop file translations: 1 month ago
translations Translated using Weblate (Bulgarian) 3 weeks ago
.gitmodules Drop automake build support. 1 month ago
AUTHORS Added abandoned KDE3 version of kdiff3 10 years ago
CMakeL10n.txt Desktop file translations: 1 month ago
CMakeLists.txt Move translations to a new directory layout. 1 month ago
COPYING Added abandoned KDE3 version of kdiff3 10 years ago
ChangeLog Added abandoned KDE3 version of kdiff3 10 years ago
ConfigureChecks.cmake conversion to the cmake building system 10 months ago
Doxyfile Added abandoned KDE3 version of kdiff3 10 years ago
INSTALL Drop automake build support. 1 month ago
README Drop automake build support. 1 month ago
TODO Added abandoned KDE3 version of kdiff3 10 years ago
config.h.cmake conversion to the cmake building system 10 months ago
kdiff3.tdevelop Finish rename from prior commit 8 years ago

README


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:

- TDE Gitea Workspace (TGW) collaboration tool.
https://mirror.git.trinitydesktop.org/gitea

- TDE Weblate Translation Workspace (TWTW) collaboration tool.
https://mirror.git.trinitydesktop.org/weblate