Johnk git alias

@chrispwood Adds an alias to git to open conflicted files in the default editor.