cfc6cbbe06
KDiff3 is a program that: * compares or merges two or three text input files or directories, * shows the differences line by line and character by character (!), * provides an automatic merge-facility * supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.), * Automatic merging of version control history From MAINTAINER Lawrence Teo, after an initial port by marco@ ok sthen@