fix vim
Merge branch 'chenxi' of github.com:wowuwowuwo/learngit into chenxi

long time no see