How do I use Meld as a merge tool with Sourcetree on Windows?

Question

I have the following in my .gitconfig file:

[user]
    name = myname
    email = myname@gmail.com
[core]
    autocrlf = true
    excludesfile = C:\\         


        

Answer 1

The actual setting to use here in order to have a real 3-way merge, with read only THEIRS and MINE tabs is this:

$LOCAL $BASE $REMOTE --auto-merge --output=$MERGED

Note the = after --output.

I've finally got this command right by digging in comments on the second answer to this question Git merging using Meld.