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.

Meld helps you review code changes and understand patches. It might even help you to figure out what is going on in that merge you keep avoiding.

Features

File comparison

Edit files in-place, and your comparison updates on-the-fly
Perform two- and three-way diffs and merges
Easily navigate between differences and conflicts
Visualise global and local differences with insertions, changes and conflicts marked
Use the built-in regex text filtering to ignore uninteresting differences
Syntax highlighting

Directory comparison

Compare two or three directories file-by-file, showing new, missing, and altered files
Directly open file comparisons of any conflicting or differing files
Filter out files or directories to avoid seeing spurious differences
Simple file management is also available

Version control

Meld supports many version control systems, including Git, Mercurial, Bazaar and SVN
Launch file comparisons to check what changes were made, before you commit
View file versioning statuses
Simple version control actions are also available (i.e., commit/update/add/remove/delete files)

Merge mode (in development)

Automatically merge two files using a common ancestor
Mark and display the base version of all conflicting changes in the middle pane
Visualise and merge independent modifications of the same file
Lock down read-only merge bases to avoid mistakes
Command line interface for easy integration with existing tools, including git mergetool