-
Committer:
Robert Collins
-
Date:
2007-03-06 12:28:18 UTC
-
mto:
(2321.1.1 integration)
-
mto:
This revision was merged to the branch mainline in
revision
2322.
-
Revision ID:
robertc@robertcollins.net-20070306122818-xk0lc3l01ecl6vbc
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.