changeset 5042 | f191bc3916f7 |
parent 4682 | dc5920ea12f8 |
child 6004 | 5af5f0f9d724 |
--- a/tests/test-merge9.out Mon Jul 30 20:01:16 2007 +0200 +++ b/tests/test-merge9.out Wed Aug 01 12:33:12 2007 -0500 @@ -5,7 +5,7 @@ merging bar merging bar failed! merging foo and baz -merging foo failed! +merging baz failed! 1 files updated, 0 files merged, 0 files removed, 2 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 2