TDE
/
kdiff3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kdiff3
0
0
Fork 0
Code Issues Releases Wiki Activity
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.
298 Commits
4 Branches
20 Tags
6.6 MiB
 
 
 
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'r14.0.13'
${ noResults }
Go to file
Slávek Banko d30491238b
Official Trinity Desktop Environment R14.0.13 release 		2 years ago
diff_ext_for_kdiff3 Use common rules for build and install documentation and translations. 3 years ago
doc Use common rules for build and install documentation and translations. 3 years ago
kdiff3plugin Desktop file translations: 4 years ago
src Desktop file translations: 4 years ago
translations Official Trinity Desktop Environment R14.0.13 release 2 years ago
AUTHORS Added abandoned KDE3 version of kdiff3 14 years ago
CMakeL10n.txt Remove obsolete setting of CMAKE_MODULE_PATH in cmake files. 2 years ago
CMakeLists.txt Use TDE cmake macro to set version 2 years ago
COPYING Added abandoned KDE3 version of kdiff3 14 years ago
ChangeLog Additional k => tde renaming and fixes 11 years ago
ConfigureChecks.cmake conversion to the cmake building system 5 years ago
Doxyfile Added abandoned KDE3 version of kdiff3 14 years ago
INSTALL Drop automake build support. 4 years ago
README.md Change README to markdown format. 3 years ago
TODO Added abandoned KDE3 version of kdiff3 14 years ago
config.h.cmake conversion to the cmake building system 5 years ago
kdiff3.tdevelop Finish rename from prior commit 13 years ago

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