linebreaks in vim an color in git diff
Merge branch 'master' of github.com:Dannyzen/dotfiles