KDiff3 Project Revived For Showing File/Folder Differences, Now Part Of KDE

KDiff3 is a long-time Qt-powered program for showing compares and merges between 2_ text files or directories. It's basically a nice graphically-driven diff viewer and has automatic merge abilities, Unicode handling, etc...