Revert "Use git-merge instead of git-resolve in git-pull."
[git.git] / local-fetch.c
2005-09-08 Junio C HamanoBig tool rename.