update git config to use vimdiff for git diff and p4merge for git difftool