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

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

4 answers

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

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

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.

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

For merge command try the following arguments.

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

 

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

647 views 0 4
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you