vimのdiffの改善
Merge branch 'master' of github.com:tmsanrinsha/dotfiles