1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/results/tour-merge-conflict.son.out	Mon Mar 09 21:37:47 2009 -0700
     1.3 @@ -0,0 +1,11 @@
     1.4 +$ \textbf{cd ..}
     1.5 +$ \textbf{hg clone scam scam-son}
     1.6 +updating working directory
     1.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     1.8 +$ \textbf{cd scam-son}
     1.9 +$ \textbf{cat > letter.txt <<EOF}
    1.10 +> \textbf{Greetings!}
    1.11 +> \textbf{I am Alhaji Abba Abacha, son of the former}
    1.12 +> \textbf{Nigerian dictator Sani Abacha.}
    1.13 +> \textbf{EOF}
    1.14 +$ \textbf{hg commit -m '419 scam, with son'}