[git] use vim as editor
Merge branch 'master' into macbook