default  git mergetool for cygwin changed to vimdiff
Merge branch 'master' of github.com:cyplo/dotfiles