Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.
[git.git] / git-merge-stupid.sh
2005-09-11 Junio C HamanoUse Daniel's read-tree in the merge strategy 'resolve'.