Sublime Merge - a new Git client from the makers of Sublime Text
From the site:
A snappy UI, three-way merge tool, side-by-side diffs, syntax highlighting, and more.
Sublime Text is always open on my Mac — I use it for everything from complex text manipulation to a simple pad for content. We also use Git everyday, but I only need to observe the process. Still, I haven’t found a Git client that clicks with me.
I’ll be testing this out on the next few weeks.