15 lines
505 B
Plaintext
15 lines
505 B
Plaintext
KDiff3 is a program that:
|
|
|
|
* compares two or three text input files,
|
|
* 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.),
|
|
* and has an intuitive graphical user interface,
|
|
* and it can also compare and merge directories!
|
|
|
|
WWW: http://kdiff3.sourceforge.net/
|
|
|
|
Heiner
|
|
h.eichmann@gmx.de
|