Are you in the loop? Keep up with the latest by making sure you're subscribed to Community Announcements. Just click Watch and select Articles.

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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

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
stevestreeting
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
Jan 09, 2012

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
AUG Leaders

Atlassian Community Events