Use git-merge instead of git-resolve in git-pull.