Git merge tools with Sublime 2