Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,366,260
Community Members
 
Community Events
168
Community Groups

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

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

Feature request: could you add a simple tool tip that explains this? So this information is more readily discoverable :)

Like Desmond Smith likes this

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
TAGS

Atlassian Community Events