trinity-kdiff3 src f58a29b172cc1883d36954f832b9214b2f1e6a37a2b5b5877a42ca67406be721 KDiff3 is a utility for comparing and/or merging two or three text 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. Supports TDEIO on TDE (allows accessing ftp, sftp, fish, smb etc.). Unicode & UTF-8 support zeroability <zeroability@fastmail.com> http://www.trinitydesktop.org/