KDiff3 is a cross-platform file and folder diff and merge tool by KDE that compares and merges two or three text input files or folders, shows differences line by line and character by character, supports Unicode and various file encodings, and provides an automatic merge facility with conflict resolution editor.