Sublime Merge is a Git client for Powerusers made by the same people who made Sublime Text