vimdiff as default editor
Merge branch 'master' into win