Sublime Merge - Git, done Sublime

A snappy UI, three-way merge tool, side-by-side diffs, syntax highlighting, and more.