changeset 1351 | 0e2be889ccd7 |
parent 981 | 4f81068ed8cd |
child 1581 | db10b7114de0 |
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -15,7 +15,7 @@ remote created b getting b merging a resolving a -file a: other d730145abbf9 ancestor b789fdd96dc2 +file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 resolving manifests force None allow 1 moddirstate True linear True ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e