changeset 10431 | ba5e508b5e92 |
parent 9611 | a3d73b3e1f8a |
child 11716 | db426935fa94 |
--- a/tests/test-merge7.out Sun Feb 07 12:00:40 2010 -0600 +++ b/tests/test-merge7.out Sun Feb 07 17:44:30 2010 -0600 @@ -25,6 +25,7 @@ ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 test.txt: versions differ -> m preserving test.txt for resolve of test.txt +update: test.txt 1/1 files (100.00%) 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