Need a Diff/Merge tool for SourceTree on Mac Lion

I use Git, SourceTree and Xcode on a Mac Lion machine. But I think I need an "External Diff" tool. I will also most certainly need a Merge tool as well.

What can you suggest? I prefer free, but would pay a little for a tool that's pretty nice, and has proven reliability.

Thanks.
newbiewebSr. Software EngineerAsked:
Who is Participating?
 
pgnatyukCommented:
Of course. I use BBEdit more than 2-3 years.
In the menu there is Search->Find Differences.
Then, you choose what you want to compare. In case of the folders, you'll see all differences and select each one separately.
The menu item
You can use Xcode, FileMerge is not bad.
0
 
pgnatyukCommented:
I think BBEdit is the tool you are looking for:
http://www.barebones.com/products/bbedit/index.html?utm_source=thedeck&utm_medium=banner&utm_campaign=bbedit

You can check diffmerge:
http://www.macupdate.com/app/mac/25426/diffmerge
http://sourcegear.com/diffmerge/downloads.php

Maybe, the easiest way is to use opendiff from the Xcode package. Type in Terminal:
opendiff my_file1.m my_file2.m
It's in Xcode.app/Contents/Developer/usr/bin in you have the latest Xcode. (You may need to launch:
sudo /usr/bin/xcode-select -switch /Applications/Xcode.app/Contents/Developer)
before for Xcode 4.3).

In Xcode you find FileMerge tool too: in the main menu Xcode->Open Developer->File Merge
The app is in Xcode.app/Contents/Applications
0
 
newbiewebSr. Software EngineerAuthor Commented:
I do not see how to do diff and merge using BBEdit, but I see lots of references to is in the wiki.

Have you used BBEdit? If it works for me, I'd pay $49.99 for it.
0
 
newbiewebSr. Software EngineerAuthor Commented:
Thanks!
0
Question has a verified solution.

Are you are experiencing a similar issue? Get a personalized answer when you ask a related question.

Have a better answer? Share it in a comment.

All Courses

From novice to tech pro — start learning today.