blob: 22e108d1c4d57aa71b5c269df4b81e4e6946d87c (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
|
KDiff3 is a program that:
* compares or merges two or three text input files or directories,
* shows the differences line by line and character by character (!),
* provides an automatic merge-facility and
* an integrated editor for comfortable solving of merge-conflicts,
* supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
* Printing of differences,
* Manual alignment of lines,
* Automatic merging of version control history (cvs Log keyword),
* and has an intuitive graphical user interface.
WWW: http://kdiff3.sourceforge.net/
|
