remove prompting for diff and merge
Merge branch 'master' of github.com:binaryphile/dotfiles