Updated .gitconfig for merge tool