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.
325 Commits
4 Branches
21 Tags
6.6 MiB
 
 
 
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '7c9ad54619'
${ noResults }
Go to file
Michele Calgaro 7c9ad54619
Replaced various '#define' with actual strings - part 5 		11 months 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 Replace Q_OBJECT with TQ_OBJECT 1 year ago
src Replaced various '#define' with actual strings - part 5 11 months ago
translations Translated using Weblate (Russian) 11 months ago
AUTHORS Added abandoned KDE3 version of kdiff3 15 years ago
CMakeL10n.txt Raise the minimum required version of CMake to 3.5. 1 year ago
CMakeLists.txt Raise the minimum required version of CMake to 3.5. 1 year ago
COPYING Added abandoned KDE3 version of kdiff3 15 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 15 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 15 years ago
config.h.cmake conversion to the cmake building system 5 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