Source Tree External diff tools not working

[Hui Zhao]

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

[Krisztian Fekete]

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.

[Krisztian Fekete]

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.

[Hui Zhao]

I don't use Mac. I use Windows.