[PATCH] Be more like the 'resolve' strategy.
[git.git] / git-merge-stupid.sh
2005-09-11 Junio C HamanoUse Daniel's read-tree in the merge strategy 'resolve'.