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.
258 Commits
4 Branches
21 Tags
6.7 MiB
 
 
 
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '4e2d5c5aa1'
${ noResults }
Go to file
Slávek Banko 4e2d5c5aa1
Remove the original translation directory layout. 		4 years ago
cmake@80ab8717cc Reset submodule main/applications/kdiff3/cmake to latest HEAD 4 years ago
diff_ext_for_kdiff3 Remove the original translation directory layout. 4 years ago
doc Move translations to a new directory layout. 4 years ago
kdiff3plugin Remove the original translation directory layout. 4 years ago
src Move translations to a new directory layout. 4 years ago
translations Move translations to a new directory layout. 4 years ago
.gitmodules Drop automake build support. 4 years ago
AUTHORS Added abandoned KDE3 version of kdiff3 15 years ago
CMakeL10n.txt Add CMakeL10n rules. 6 years ago
CMakeLists.txt Move translations to a new directory layout. 4 years 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 Drop automake build support. 4 years ago
TODO Added abandoned KDE3 version of kdiff3 15 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 

 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