changed to diffmerge
Merge branch 'master' of github.com:stephennmcdonald/dotfiles