|
|
@ -6,11 +6,12 @@ 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
|
|
|
|
differences line by line and character by character. It provides an
|
|
|
|
automatic merge facility and an integrated editor for comfortable
|
|
|
|
automatic merge facility and an integrated editor for comfortable
|
|
|
|
solving of merge conflicts.
|
|
|
|
solving of merge conflicts.
|
|
|
|
|
|
|
|
|
|
|
|
KDiff3 allows recursive directory comparison and merging as well.
|
|
|
|
KDiff3 allows recursive directory comparison and merging as well.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Included features:
|
|
|
|
Included features:
|
|
|
|
==================
|
|
|
|
------------------
|
|
|
|
|
|
|
|
|
|
|
|
- compares and merges two or three input files or directories,
|
|
|
|
- compares and merges two or three input files or directories,
|
|
|
|
- shows the differences line by line and character by character (!)
|
|
|
|
- shows the differences line by line and character by character (!)
|
|
|
@ -20,10 +21,10 @@ Included features:
|
|
|
|
- has an intuitive graphical user interface
|
|
|
|
- has an intuitive graphical user interface
|
|
|
|
- has a Konqueror service menu plugin
|
|
|
|
- has a Konqueror service menu plugin
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Contributing
|
|
|
|
CONTRIBUTING
|
|
|
|
--------------
|
|
|
|
==============
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
If you wish to contribute to kdiff3 (TDE), you might do so:
|
|
|
|
If you wish to contribute to kdiff3 (TDE), you might do so:
|
|
|
|
|
|
|
|
|
|
|
@ -32,3 +33,19 @@ If you wish to contribute to kdiff3 (TDE), you might do so:
|
|
|
|
|
|
|
|
|
|
|
|
- TDE Weblate Translation Workspace (TWTW) collaboration tool.
|
|
|
|
- TDE Weblate Translation Workspace (TWTW) collaboration tool.
|
|
|
|
https://mirror.git.trinitydesktop.org/weblate
|
|
|
|
https://mirror.git.trinitydesktop.org/weblate
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Translations status
|
|
|
|
|
|
|
|
---------------------
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### messages
|
|
|
|
|
|
|
|
[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/kdiff3/multi-auto.svg
|
|
|
|
|
|
|
|
"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### plugin
|
|
|
|
|
|
|
|
[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/kdiff3-plugin/multi-auto.svg
|
|
|
|
|
|
|
|
"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### desktop files
|
|
|
|
|
|
|
|
[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/kdiff3-desktop-files/multi-auto.svg
|
|
|
|
|
|
|
|
"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-desktop-files/)
|