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

Question

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 · Answer

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

Brendan Simon · Answer

For merge command try the following arguments.

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

Seth · Answer

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.