Sophisticated text editor for code, markup and prose

Sublime Merge is a Git client, from the makers of Sublime Text