modified file
hoge
Merge branch 'master' of github.com:ivezuki/vimrc