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