changeset 5045 | f191bc3916f7 |
parent 4674 | 723e0ddb6ada |
child 5371 | 17ed9b9a0d03 |
--- a/tests/test-rename-merge1.out +++ b/tests/test-rename-merge1.out @@ -7,9 +7,9 @@ resolving manifests a2: divergent renames -> dr a: remote moved to b -> m b2: remote created -> g +copying a to b merging a and b my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c -copying a to b removing a warning: detected divergent renames of a2 to: c2