[PATCH] Fix assertion failure when merging common ancestors.
[git.git] / git-merge-stupid.sh
2005-09-11 Junio C HamanoUse Daniel's read-tree in the merge strategy 'resolve'.