diff --git a/tests/test-merge-revert2.out b/tests/test-merge-revert2.out --- a/tests/test-merge-revert2.out +++ b/tests/test-merge-revert2.out @@ -14,6 +14,9 @@ merging file1 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