Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

what diff tool to use with mac version of sourcetree with hg?

Peter Kellner
Peter Kellner August 14, 2012

Trying to figure out what tool to use on mac osx 10.7 for doing merge with sourcetree and hg

Answer
Watch
Like Be the first to like this
1567 views

2 answers

0 votes
schinckel
schinckel May 10, 2017

I've been using Kaleidoscope, which is a paid app. It's rather nice though.

Reply
0 votes
stevestreeting
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.
Get recognized
August 14, 2012

FileMerge is actually a really good tool for both diffing and 3-way merging, and it's free (you get it automatically when you install XCode).

Reply

Suggest an answer

Log in or Sign up to answer
Bitbucket
Bitbucket
TAGS
AUG Leaders

Atlassian Community Events

    See all events