gdiff: word-based diff with colors
Merge branch 'master' of https://github.com/mcandre/dotfiles