1.1 --- a/en/examples/tour-merge-conflict.commit.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/tour-merge-conflict.commit.out	Tue Aug 26 14:14:19 2008 -0700
     1.3 @@ -3,6 +3,7 @@
     1.4  > \textbf{I am Bryan O'Sullivan, no relation of the former}
     1.5  > \textbf{Nigerian dictator Sani Abacha.}
     1.6  > \textbf{EOF}
     1.7 +$ \textbf{hg resolve -m letter.txt}
     1.8  $ \textbf{hg commit -m 'Send me your money'}
     1.9  $ \textbf{hg tip}
    1.10  changeset: