Use Daniel's read-tree in the merge strategy 'resolve'.
[gitweb.git] / checkout-index.c
2005-09-08 Big tool rename.