Sublime Merge

Sublime Merge is a modern, high-performance Git client developed by the creators of Sublime Text. It offers a fast, clean and optimised interface for managing commits, branches and merges.