KDiff3
Tool for Comparison and Merge of Files and 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 KIO on KDE (allows accessing ftp, sftp, fish, smb etc.).
Konqueror context menu plugin included.
Unicode & UTF-8 support
Translations by the KDE-I18N-Team:
Interface: az, bg, br, ca, cs, cy, da, de, el, en, en_GB, es, et, fr, ga, gl, hi, hu, is, it, ja, ka, lt, nb, nl, pl, pt, pt_BR, ro, ru, rw, sr, sr@Latn, sv, ta, tg, tr, uk, zh_CN
Documentation: da, de, es, et, fr, it, nl, pt, sv |