Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

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

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 :)

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
Community showcase
Posted in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

3,716 views 19 19
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