update mergetool in gitconfig
Merge branch 'master' of github.com:jbub/dotfiles