gitconfig for diff and merge