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

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

2 answers

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

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

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Nov 06, 2018 in Bitbucket

Upgrade Best Practices

Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...

678 views 5 9
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you