changeset 5371 | 17ed9b9a0d03 |
parent 4385 | 93a4e72b4f83 |
--- a/tests/test-merge7.out +++ b/tests/test-merge7.out @@ -24,6 +24,7 @@ warning: conflicts during merge. resolving manifests overwrite None partial False ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 + searching for copies back to rev 1 test.txt: versions differ -> m merging test.txt my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9