changeset 3121 | 2ef0b3aae186 |
parent 3110 | 40e777bda455 |
child 3314 | b16456909a0a |
--- a/tests/test-update-reverse.out Sun Sep 17 21:11:26 2006 -0500 +++ b/tests/test-update-reverse.out Sun Sep 17 21:27:30 2006 -0500 @@ -42,9 +42,9 @@ resolving manifests overwrite True branchmerge False partial False ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d -remote deleted side2, clobbering -remote deleted side1, clobbering -remote created main + side2: remote deleted -> r + side1: remote deleted -> r + main: remote created -> g getting main removing side1 removing side2