fix vimdiff color
Merge branch 'master' of github.com:CandySunPlus/dot_vim
fix