| changeset 3869 | ad6f34c83c3d |
| parent 2175 | b2ae81a7df29 |
| child 4365 | 46280c004f22 |
--- a/tests/test-merge-revert2.out Mon Dec 11 14:30:50 2006 +0100 +++ b/tests/test-merge-revert2.out Mon Dec 11 18:09:52 2006 +0100 @@ -14,6 +14,9 @@ merging file1 failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges with locally modified files. +You can redo the full merge using: + hg update 0 + hg update 1 diff -r f248da0d4c3e file1 --- a/file1 +++ b/file1