Use Daniel's read-tree in the merge strategy 'resolve'.
[git] / update-index.c
2005-09-08  Junio C HamanoBig tool rename.