Version Control > meld

Meld is a visual diff and merge tool that helps you compare files, directories, and version controlled projects.