changeset 3111 | 40e777bda455 |
parent 3095 | 92a0c2200e41 |
child 3122 | 2ef0b3aae186 |
--- a/tests/test-update-reverse.out +++ b/tests/test-update-reverse.out @@ -40,7 +40,7 @@ a side1 side2 resolving manifests - overwrite True branchmerge False partial False linear False + overwrite True branchmerge False partial False ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d remote deleted side2, clobbering remote deleted side1, clobbering