Use git-merge instead of git-resolve in git-pull.
[gitweb.git] / diff-index.c
2005-09-08 Big tool rename.