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 cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
261 Commits
4 Branches
21 Tags
6.8 MiB
C++ 97.3%
C 2%
CMake 0.6%
Makefile 0.1%
 
 
 
 
master
r14.1.x
r14.0.x
v3.5.13-sru
r14.1.3
r14.1.2
r14.1.1
r14.1.0
r14.0.13
r14.0.12
r14.0.11
r14.0.10
r14.0.9
r14.0.8
r14.0.7
r14.0.6
r14.0.5
r14.0.4
r14.0.3
r14.0.2
r14.0.1
r14.0.0
v3.5.13.2
v3.5.13.1
v3.5.13
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'e14732aa76'
${ noResults }
Go to file
gregory guy e14732aa76
Drop automake build support. 
Add basic cmake build instructions.
Delete the NEWS file.
Rework of the README.
The man folder has been moved into the doc folder for consistency with what
have been done so far.
The html pages have been moved into the doc folder as well.
Some cosmetics.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
 		5 years ago
cmake@3bbc0e4d62 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
diff_ext_for_kdiff3 Update translation files 5 years ago
doc Drop automake build support. 5 years ago
kdiff3plugin Drop automake build support. 5 years ago
po Drop automake build support. 5 years ago
src Drop automake build support. 5 years ago
.gitmodules Drop automake build support. 5 years ago
AUTHORS Added abandoned KDE3 version of kdiff3 15 years ago
CMakeL10n.txt Add CMakeL10n rules. 6 years ago
CMakeLists.txt Drop automake build support. 5 years ago
COPYING Added abandoned KDE3 version of kdiff3 15 years ago
ChangeLog Additional k => tde renaming and fixes 12 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. 5 years ago
README Drop automake build support. 5 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