diff options
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/README.md b/README.md new file mode 100644 index 0000000..ff03e8a --- /dev/null +++ b/README.md @@ -0,0 +1,51 @@ + + 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 + + +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/) |