blob: 1726997be06455fa9ca6e1fcc0112c72520f980b (
plain)
1
2
3
4
5
6
7
8
|
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)
* and has an intuitive graphical user interface.
|
