Meld is a visual diff and merge tool targeted at developers.
Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and has support for many popular version control systems.
More info here: