git: difftool config tweaks
Merge branch 'master' of github.com:dearieme/dotfiles