1.1 --- a/en/examples/tour-merge-conflict	Wed Aug 20 21:58:19 2008 +0200
     1.2 +++ b/en/examples/tour-merge-conflict	Wed Aug 20 22:00:46 2008 +0200
     1.3 @@ -68,5 +68,6 @@
     1.4  Nigerian dictator Sani Abacha.
     1.5  EOF
     1.6  
     1.7 +hg resolve -m letter.txt
     1.8  hg commit -m 'Send me your money'
     1.9  hg tip

     2.1 --- a/en/examples/tour-merge-conflict.commit.out	Wed Aug 20 21:58:19 2008 +0200
     2.2 +++ b/en/examples/tour-merge-conflict.commit.out	Wed Aug 20 22:00:46 2008 +0200
     2.3 @@ -3,6 +3,7 @@
     2.4  > \textbf{I am Bryan O'Sullivan, no relation of the former}
     2.5  > \textbf{Nigerian dictator Sani Abacha.}
     2.6  > \textbf{EOF}
     2.7 +$ \textbf{hg resolve -m letter.txt}
     2.8  $ \textbf{hg commit -m 'Send me your money'}
     2.9  $ \textbf{hg tip}
    2.10  changeset:   

     3.1 --- a/en/examples/tour-merge-conflict.cousin.out	Wed Aug 20 21:58:19 2008 +0200
     3.2 +++ b/en/examples/tour-merge-conflict.cousin.out	Wed Aug 20 22:00:46 2008 +0200
     3.3 @@ -1,5 +1,6 @@
     3.4  $ \textbf{cd ..}
     3.5  $ \textbf{hg clone scam scam-cousin}
     3.6 +updating working directory
     3.7  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     3.8  $ \textbf{cd scam-cousin}
     3.9  $ \textbf{cat > letter.txt <<EOF}

     4.1 --- a/en/examples/tour-merge-conflict.merge.out	Wed Aug 20 21:58:19 2008 +0200
     4.2 +++ b/en/examples/tour-merge-conflict.merge.out	Wed Aug 20 22:00:46 2008 +0200
     4.3 @@ -4,9 +4,7 @@
     4.4  merge: warning: conflicts during merge
     4.5  merging letter.txt failed!
     4.6  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
     4.7 -There are unresolved merges, you can redo the full merge using:
     4.8 -  hg update -C 1
     4.9 -  hg merge 2
    4.10 +use 'hg resolve' to retry unresolved file merges
    4.11  $ \textbf{cat letter.txt}
    4.12  Greetings!
    4.13  

     5.1 --- a/en/examples/tour-merge-conflict.pull.out	Wed Aug 20 21:58:19 2008 +0200
     5.2 +++ b/en/examples/tour-merge-conflict.pull.out	Wed Aug 20 22:00:46 2008 +0200
     5.3 @@ -1,5 +1,6 @@
     5.4  $ \textbf{cd ..}
     5.5  $ \textbf{hg clone scam-cousin scam-merge}
     5.6 +updating working directory
     5.7  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     5.8  $ \textbf{cd scam-merge}
     5.9  $ \textbf{hg pull -u ../scam-son}

     6.1 --- a/en/examples/tour-merge-conflict.son.out	Wed Aug 20 21:58:19 2008 +0200
     6.2 +++ b/en/examples/tour-merge-conflict.son.out	Wed Aug 20 22:00:46 2008 +0200
     6.3 @@ -1,5 +1,6 @@
     6.4  $ \textbf{cd ..}
     6.5  $ \textbf{hg clone scam scam-son}
     6.6 +updating working directory
     6.7  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     6.8  $ \textbf{cd scam-son}
     6.9  $ \textbf{cat > letter.txt <<EOF}