Add vimdiff merge/difftool to gitconfig. Add :bufdo q shortcut