How to solve merge conflicts so that just two files are shown in meld

Question

I'm using meld as mergetool for git and I'm wondering why meld always shows three files when I run git mergetool. I would prefer to see only two files in meld (the HEAD version and the version from the other branch that I want to merge). Is it possible to configure meld so that it does the merge with only two files?

This is my current .gitconfig file:

[merge]
    tool = meld
[mergetool]
    prompt = false
[mergetool "meld"]
    trustExitCode = true
cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" --output=\"$PWD/$MERGED\"

Answer 1

Your current .gitconfig runs Meld in a three-way directory compare between $LOCAL, $BASE, and $REMOTE. If you want set this up as a two-way compare (assuming you don't want to compare against $REMOTE), simply change your config to (i.e. remove the $REMOTE command argument)

cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" --output=\"$PWD/$MERGED\"