2d8d7e9441
From Kimura Fuyuki in PR pkg/35914
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.
8 lines
395 B
Text
8 lines
395 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)
|
|
* and has an intuitive graphical user interface.
|