Meld

Resolving merge conflicts

One of the best uses of Meld is to resolve conflicts that occur while merging different branches.

For example, when using Git, git mergetool will start a 'merge helper'; Meld is one such helper. If you want to make git mergetool use Meld by default, you can add

[merge]
    tool = meld

to .git/gitconfig. See the git mergetool manual for details.