Unable to open external merge tool "Meld" from source tree.

[sanatan r]

Hi I am unable to launch the external merge tool "Meld" from the source tree software. 

Here is what have in the .gitconfig :

[mergetool "sourcetree"]
cmd = 'C:/Program Files (x86)/Meld/Meld.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"

trustExitCode = true

[Brendan Simon]

For merge command try the following arguments.

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

[Steven Olsen]

I'm kind of having the same problem. External merge tool is disabled.

https://crazy4groovy.tinytake.com/sf/NDA0Njc2XzIyMzkyOTI

In .gitconfig:

[mergetool "sourcetree"]
   cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
 trustExitCode = true

[Seth]

This is a completely different issue. Based on your screenshot, "Launch external merge tool" is disabled because git thinks the file in question doesn't have conflicts. However, the diff view clearly shows conflict markers in the file. Choose "mark unresolved" from that menu first, then you should be able to launch your merge tool.

[Brendan Simon]

This might happen if you have selected to ignore white space.  Try not ignoring white space and see what happens.

[sanatan r]

Thanks Seth.

I was actually able to make it work using the following :

[mergetool "Meld"] 
cmd = 'C:/Program Files (x86)/Meld/Meld.exe' \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true

Looks like adding one more parameter makes the Meld program not show up. 

This is in a windows 7 environment .

Regards,

Sanatan

[Seth]

http://stackoverflow.com/questions/11133290/git-merging-using-meld

You might try without the double quotes.