2003-01-10 07:22:51 +01:00
|
|
|
KDiff3 is a program that:
|
|
|
|
|
|
2004-06-07 16:28:45 +02:00
|
|
|
* compares or merges two or three text input files or directories,
|
2003-01-10 07:22:51 +01:00
|
|
|
* shows the differences line by line and character by character (!),
|
|
|
|
|
* provides an automatic merge-facility and
|
2004-03-19 09:50:51 +01:00
|
|
|
* an integrated editor for comfortable solving of merge-conflicts,
|
|
|
|
|
* supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.),
|
2006-05-20 02:42:47 +02:00
|
|
|
* Printing of differences,
|
|
|
|
|
* Manual alignment of lines,
|
|
|
|
|
* Automatic merging of version control history (cvs Log keyword),
|
2004-06-07 16:28:45 +02:00
|
|
|
* and has an intuitive graphical user interface.
|
2003-01-10 07:22:51 +01:00
|
|
|
|
|
|
|
|
WWW: http://kdiff3.sourceforge.net/
|
