Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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

unable to launch external diff from sourcetree

Using sourceTree version 2.1.2.5
Trying to open a diff via External Diff , but nothing happens .

in setting :

allow source tree to ... is enabled !

under diff i have tried to use beyond compare ,DiffMerge , TortoiseMerge 
(all are installed and working )

 

1 answer

Hi Zvika,

I recently upgraded to 2.1.2.5 and installed P4Merge, KDiff3, TortoiseMerge and Beyond Compare after upgrading. They all worked and SourceTree actually automatically found the source location.

I'm assuming you went into the Options screen from the Tools menu option to access the Diff tab to select the external diff tool from the drop-down for diff tool and merge tool?

Greg 

Yes i did but it doesn't work image.png

I have the really same problem here.. Tried winmerge, kdiff3, diffmerge and no luck.

I tried to configure .gitconfig file without success. The message pops then disappear but nothing happens.

Like Mark Keckeis likes this

Does this work for anyone?

@TC I literally JUST got it working, the solution for me was to update the Embedded Git (2.14.1 at time of writing) and then external merge works for me. I don't believe this is automatically updated when you update sourcetree.

Note that external DIFF suddenly started working for me for no apparent reason a few weeks ago, maybe an update fixed it. So because diff was working but not merge, I took a look with Process Monitor to see if there was an obvious difference, but SourceTree just shells out to git.exe to actually launch the diff/merge tool, which pointed strongly to the embedded git or configuration as the problem.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,416 views 4 5
Read article

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