@matheusbsbs / matheus-bagliano / commits / 70b1fb23e2
Fork 0

Merge branch 'jc/cache-tree' into next

* jc/cache-tree: read-tree: teach 1-way merege and plain read to prime cache-tree. read-tree: teach 1 and 2 way merges about cache-tree. update-index: when --unresolve, smudge the relevant cache-tree entries.

Junio C Hamano committed Apr 27, 2006 at 01:37 UTC 70b1fb23e29a909883c4a1b452610e5b1aa414a6

No changes.