changeset 6512 | 368a4ec603cc |
parent 6338 | 0750f11152fe |
child 6518 | 92ccccb55ba3 |
--- a/tests/test-merge7.out Thu Apr 10 14:25:50 2008 +0200 +++ b/tests/test-merge7.out Thu Apr 10 15:02:24 2008 -0500 @@ -26,6 +26,7 @@ ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 searching for copies back to rev 1 test.txt: versions differ -> m +preserving test.txt for resolve of test.txt picked tool 'internal:merge' for test.txt (binary False symlink False) merging test.txt my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9