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.
Slávek Banko
b974696af9
|
4 years ago | |
|---|---|---|
| cmake@80ab8717cc | 5 years ago | |
| diff_ext_for_kdiff3 | 4 years ago | |
| doc | 4 years ago | |
| kdiff3plugin | 4 years ago | |
| src | 4 years ago | |
| translations | 4 years ago | |
| .gitmodules | 5 years ago | |
| AUTHORS | 15 years ago | |
| CMakeL10n.txt | 4 years ago | |
| CMakeLists.txt | 4 years ago | |
| COPYING | 15 years ago | |
| ChangeLog | 11 years ago | |
| ConfigureChecks.cmake | 5 years ago | |
| Doxyfile | 15 years ago | |
| INSTALL | 5 years ago | |
| README | 5 years ago | |
| TODO | 15 years ago | |
| config.h.cmake | 5 years ago | |
| kdiff3.tdevelop | 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