changeset 3305 | e7abcf3a7c5f |
parent 3295 | 764688cf51e5 |
child 3314 | ecc1bf27378c |
--- a/tests/test-rename-merge1.out +++ b/tests/test-rename-merge1.out @@ -8,7 +8,7 @@ resolving manifests b2: remote created -> g merging a and b to b resolving a -my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c +my a@. other b@8e765a822af2 ancestor a@af1939970a1c copying a to b removing a getting b2