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
Accepted answer

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

Scrum Roles Explained: the Do's and the Don'ts

Hello Community,  Today we are going to talk about the three Scrum Roles. There is the Development Team, the Scrum Master and the Product Owner. In my opinion these three are all really impo...

114 views 1 5
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