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

Diff dropdown in prefs greyed out?

Hi guys.

I'm running SourceTree 1.3.0b3, and have installed Araxis Merge (in /Applications).

When I go to the diff panel in the prefs, dropdowns for "visual diff tool" and "merge tool" are both greyed out.

Any hints to how I tell SourceTree to use Araxis merge?

2 answers

1 accepted

10 votes
Answer accepted

These options are greyed out if you've unchecked the box 'Allow SourceTree to modify your global Mercurial and Git configuration files' at the top of the 'General' tab. SourceTree can't set up the external diff for you if it's not allowed to update the config files.

You can use an alternative diff (probably merge too?) tool in mercurial *without* needing to 'Allow SourceTree to modify your global Mercurial and Git configuration files'.

In your ~/.hgrc you can have:

[extensions]
hgext.extdiff =

[extdiff]
cmd.sourcetreediff=/usr/local/bin/twdiff
opts.sourcetreediff=--resume --reverse --wait

for example.

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted in Jira

We want to hear from you! How do you use Slack and Atlassian together?

Hi Everyone! My name is Mina and I am on Atlassian’s Ecosystems Marketing team. Our team is focused on our technology partnerships and marketplace apps. One of Atlassian’s partners is Slack, who ...

44 views 0 4
Join discussion

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