Use git-merge instead of git-resolve in git-pull.
[gitweb.git] / git-merge-stupid.sh
2005-09-11 Use Daniel's read-tree in the merge strategy 'resolve'.