vim -p and LC_ALL git
Merge branch 'master' of https://github.com/smlgbl/dotFiles