TDE
/
kdiff3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kdiff3
0
0
Fork 0
Code Issues Releases Wiki Activity
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.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '80648176de'
${ noResults }
kdiff3/README.md

52 lines
1.8 KiB
Raw Normal View History Unescape

Added abandoned KDE3 version of kdiff3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
15 years ago
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> (cherry picked from commit e14732aa76b0fc20b955da434b1e2e92012c34e8)
5 years ago
kdiff3 - a diff and merge program.
Added abandoned KDE3 version of kdiff3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
15 years ago
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> (cherry picked from commit e14732aa76b0fc20b955da434b1e2e92012c34e8)
5 years ago
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.
Change README to markdown format. Add translation status overview. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit fb4306858029a58ae6dfcb098bcb45096d86df51)
3 years ago
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> (cherry picked from commit e14732aa76b0fc20b955da434b1e2e92012c34e8)
5 years ago
KDiff3 allows recursive directory comparison and merging as well.
Added abandoned KDE3 version of kdiff3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
15 years ago
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> (cherry picked from commit e14732aa76b0fc20b955da434b1e2e92012c34e8)
5 years ago
Included features:
Change README to markdown format. Add translation status overview. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit fb4306858029a58ae6dfcb098bcb45096d86df51)
3 years ago
------------------
Added abandoned KDE3 version of kdiff3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
15 years ago
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> (cherry picked from commit e14732aa76b0fc20b955da434b1e2e92012c34e8)
5 years ago
- 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
Added abandoned KDE3 version of kdiff3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
15 years ago
Change README to markdown format. Add translation status overview. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit fb4306858029a58ae6dfcb098bcb45096d86df51)
3 years ago
.
Added abandoned KDE3 version of kdiff3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
15 years ago
Change README to markdown format. Add translation status overview. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit fb4306858029a58ae6dfcb098bcb45096d86df51)
3 years ago
Contributing
--------------
Added abandoned KDE3 version of kdiff3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
15 years ago
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> (cherry picked from commit e14732aa76b0fc20b955da434b1e2e92012c34e8)
5 years ago
If you wish to contribute to kdiff3 (TDE), you might do so:
Added abandoned KDE3 version of kdiff3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
15 years ago
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> (cherry picked from commit e14732aa76b0fc20b955da434b1e2e92012c34e8)
5 years ago
- TDE Gitea Workspace (TGW) collaboration tool.
https://mirror.git.trinitydesktop.org/gitea
Added abandoned KDE3 version of kdiff3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
15 years ago
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> (cherry picked from commit e14732aa76b0fc20b955da434b1e2e92012c34e8)
5 years ago
- TDE Weblate Translation Workspace (TWTW) collaboration tool.
https://mirror.git.trinitydesktop.org/weblate
Change README to markdown format. Add translation status overview. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit fb4306858029a58ae6dfcb098bcb45096d86df51)
3 years ago
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/)