open conflicted files in editor [git] [alias]