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.