I'm all for Sublime Text and Merge, my daily drivers for all kinds of writing..