Meld, a visual diff and merging tool for developers, is available. Meld allows you to compare files, directories, or version controlled projects. It supports many popular version control systems and allows for two- and three-way file and directory comparisons.
Meld allows you to review code changes and understand patching. It may even help you figure out why you are avoiding a merge.