changeset 8753 | af5f099d932b |
parent 8734 | 60fa3371aa75 |
child 10431 | ba5e508b5e92 |
--- a/tests/test-update-reverse.out Mon Jun 08 18:14:44 2009 -0500 +++ b/tests/test-update-reverse.out Mon Jun 08 18:14:44 2009 -0500 @@ -42,7 +42,7 @@ side2 resolving manifests overwrite True partial False - ancestor 537353581d3d local ded32b0db104+ remote 221226fb2bd8 + ancestor ded32b0db104+ local ded32b0db104+ remote 221226fb2bd8 side2: other deleted -> r side1: other deleted -> r main: remote created -> g