Sublime Merge Git Client, done Sublime. Meet a new Git Client, from the makers of Sublime Text. A snappy UI, three-way merge tool, side-by-side diffs, syntax highlighting, and more. Stage Files, Hunks and Lines with no waiting – Sublime Merge is really, really fast.
Feature Highlights:
Integrated Merge Tool
Powerful Search
Unmatched Performance
Blame
Advanced Diffs
File and Hunk History
Command Palette and Key Bindings
Light and Dark Themes
Extensibility
Syntax Highlighting
Command-Line Integration
Real Git
Compatibility: OS X 10.7 or later, 64-bit processor