9 lines
460 B
Text
9 lines
460 B
Text
KDiff3 is a program that
|
|
- compares and merges two or three 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
|
|
- has support for KDE-KIO (ftp, sftp, http, fish, smb),
|
|
- has an intuitive graphical user interface,
|
|
- provides a context menu for KDE-Konqueror and Windows-Explorer,
|
|
- supports 64 bit systems.
|