Sublime Merge is a new Git Client for Mac, Windows and Linux, from the makers of Sublime Text