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

Community moderators have prevented the ability to post new answers.

0 votes

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

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

0 votes

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

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.