Meld merge tool

Homepage: meldmerge.org

git mergetool will start the merge program you have set. If you want to set meld as your merge tool:

git config --global merge.tool meld
git config --global diff.tool meld

or edit the config:

.git/gitconfig

[merge]
    tool = meld
[diff]
    tool = meld