Merge branch 'lt/oneway'
* lt/oneway: read-tree --reset -u fix. read-tree -u one-way merge fix to check out locally modified paths. Simplify "git reset --hard" Allow one-way tree merge to remove old files
Junio C Hamano committed
May 15, 2006 at 18:15 UTC
8701ea0f627dcba4bb75570f87df9c93985d397a
No changes.