Source Tree External diff tools not working

The latest Source Tree. Version 2.1.10.0.

The diff tools can not be launched. I have two: TortoiseMerge and DiffMerge. Either of them is not working.

I check the config file. It is:

[user]
name = Blah Blah
email = blah@software.com
[core]
autocrlf = true
excludesfile = C:\\Users\\MyName\\Documents\\gitignore_global.txt
[difftool "TortoiseMerge"]
cmd = 'C:/Program Files/TortoiseSVN/bin/TortoiseMerge.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "TortoiseMerge"]
cmd = 'C:/Program Files/TortoiseSVN/bin/TortoiseMerge.exe' -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"
trustExitCode = true
[difftool "sourcetree"]
cmd = 'C:/Program Files/TortoiseSVN/bin/TortoiseMerge.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = 'C:/Program Files/TortoiseSVN/bin/TortoiseMerge.exe' -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"
trustExitCode = true

 

 

1.PNG

1 answer

I have the same issue on Mac with SourceTree version 2.6.1 (126). When I right-click on the merge conflict and select Launch External Merge Tool, nothing happens. I had the default config, I haven't modified my .gitconfig or the SourceTree prefrences. This used to work fine and launch FileMerge.

For Mac users: the solution for me was to open Xcode on Mac, accept the Terms & Conditions and let it install it's updates.

Then I issued

sudo xcode-select -s /Applications/Xcode.app/Contents/Developer

  And now FileMerge launches from SourceTree.

I don't use Mac. I use Windows. 

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 ...

649 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