Added diff and merge tool configs to .gitconfig