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

beyond compare

I'm using Beyond Compare 3 and SourceTree 1.10.20.1. I've tried everything I could think of to get SourceTree to use Beyond Compare as the external diff tool to no avail (edit .gticonfig directly, using the Tools|Options|Diff dialog once by selecting Beyond Compare as the external diff tool and once by selecting Custom and entering the commands manually). Below is what SourceTree ads to .gitconfig when I select Beyond Compare:

[difftool "sourcetree"]
	cmd = 'C:/Program Files (x86)/Beyond Compare 3/BComp.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
	cmd = 'C:/Program Files (x86)/Beyond Compare 3/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
	trustExitCode = true

I can't see anything wrong with this, yet Ctrl+D or external Diff does simply nothing.

I had this all working, so what am I missing?

1 answer

Some initial troubleshooting ideas:

1) Did you install Beyond Compare 3 to that location? My computer has a SSD for C, so I typically install software onto my D drive instead.

2) Have you tried launching Beyond Compare from the command line using that command (replacing the variables with test files)?

3) Have you tried running "git difftool" from the command line? It should use that same config to launch Beyond Compare 3.

4) Is there another diff tool that SourceTree will launch correctly? If so, you might check to see if it escapes characters the same way in the .gitconfig.

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,205 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