![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 27 Apr 2006 08:37:03 +0000 (01:37 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 27 Apr 2006 08:37:03 +0000 (01:37 -0700) |
* 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.
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.
Trivial merge