1.1 --- a/en/examples/tour-merge-conflict.merge.out	Wed Aug 20 22:00:46 2008 +0200
     1.2 +++ b/en/examples/tour-merge-conflict.merge.out	Sun Jan 04 23:04:06 2009 -0500
     1.3 @@ -4,7 +4,9 @@
     1.4  merge: warning: conflicts during merge
     1.5  merging letter.txt failed!
     1.6  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
     1.7 -use 'hg resolve' to retry unresolved file merges
     1.8 +There are unresolved merges, you can redo the full merge using:
     1.9 +  hg update -C 1
    1.10 +  hg merge 2
    1.11  $ \textbf{cat letter.txt}
    1.12  Greetings!
    1.13