Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

5,011 views 0 12
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you