blob: 8b9836a82fd2be17e51cceca7b949f56500a2f52 (
plain) (
tree)
|
|
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
* 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
|
