A Visual Diff and Merge Tool
Use Meld to visually compare files and directories, resolve complex three-way merge conflicts, and audit your code repositories via a visually appealing, color-coded, side-by-side interface.
Source: Linux Magazine Full Feed