blob: 1cacfe4b81d55507d50ea44ddda4095109883652 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
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
|
