1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/examples/tour-merge-conflict.wife.out	Fri Aug 14 12:10:47 2009 -0700
     1.3 @@ -0,0 +1,7 @@
     1.4 +$ \textbf{cat > letter.txt <<EOF}
     1.5 +> \textbf{Greetings!}
     1.6 +> \textbf{I am Mariam Abacha, the wife of former}
     1.7 +> \textbf{Nigerian dictator Sani Abacha.}
     1.8 +> \textbf{EOF}
     1.9 +$ \textbf{hg add letter.txt}
    1.10 +$ \textbf{hg commit -m '419 scam, first draft'}