changeset 3311 | 966632304dde |
parent 3299 | e7abcf3a7c5f |
child 3314 | b16456909a0a |
--- a/tests/test-merge7.out Tue Oct 10 01:13:03 2006 -0500 +++ b/tests/test-merge7.out Tue Oct 10 01:16:06 2006 -0500 @@ -26,7 +26,6 @@ ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9 test.txt: versions differ -> m merging test.txt -resolving test.txt my test.txt@. other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 merging test.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved