Trying to figure out what tool to use on mac osx 10.7 for doing merge with sourcetree and hg
I've been using Kaleidoscope, which is a paid app. It's rather nice though.
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.