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

Using DiffMerge for conflict resolution (OSX)

I have set DiffMerge as my application for both visual diff tool, and merge tool, but when I click launch external merge tool, it flashes a dialog box, and does nothing else. How do I get this to work?

1 answer

0 votes
Manju Atlassian Team Jun 30, 2017

Hi Jay,

Can you provide some screenshots, logs and specify the version of SourceTree you are using? 

If its not v2.5.3, I would recommend you to update to the latest version and give it a try before you provide more detials in here.

Thanks!

 

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

4,955 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