changeset 2979 | 92a0c2200e41 |
parent 2830 | 49988d9f0758 |
child 3110 | 40e777bda455 |
--- a/tests/test-update-reverse.out Tue Aug 22 19:12:09 2006 -0500 +++ b/tests/test-update-reverse.out Tue Aug 22 19:32:16 2006 -0500 @@ -41,7 +41,7 @@ side2 resolving manifests overwrite True branchmerge False partial False linear False - ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae + ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d remote deleted side2, clobbering remote deleted side1, clobbering remote created main