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

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.



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

798 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