hgbook
diff en/examples/results/tour-merge-conflict.son.out @ 564:0d5935744f87
Switch from LaTeX to XML for examples.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Mar 09 21:39:23 2009 -0700 (2009-03-09) |
parents | 44d1363234d2 |
children | 4432ad34b8e5 |
line diff
1.1 --- a/en/examples/results/tour-merge-conflict.son.out Mon Mar 09 21:37:47 2009 -0700 1.2 +++ b/en/examples/results/tour-merge-conflict.son.out Mon Mar 09 21:39:23 2009 -0700 1.3 @@ -1,11 +1,12 @@ 1.4 -$ \textbf{cd ..} 1.5 -$ \textbf{hg clone scam scam-son} 1.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput> 1.7 +<prompt>$</prompt> <userinput>hg clone scam scam-son</userinput> 1.8 updating working directory 1.9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.10 -$ \textbf{cd scam-son} 1.11 -$ \textbf{cat > letter.txt <<EOF} 1.12 -> \textbf{Greetings!} 1.13 -> \textbf{I am Alhaji Abba Abacha, son of the former} 1.14 -> \textbf{Nigerian dictator Sani Abacha.} 1.15 -> \textbf{EOF} 1.16 -$ \textbf{hg commit -m '419 scam, with son'} 1.17 +<prompt>$</prompt> <userinput>cd scam-son</userinput> 1.18 +<prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput> 1.19 +<prompt>></prompt> <userinput>Greetings!</userinput> 1.20 +<prompt>></prompt> <userinput>I am Alhaji Abba Abacha, son of the former</userinput> 1.21 +<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput> 1.22 +<prompt>></prompt> <userinput>EOF</userinput> 1.23 +<prompt>$</prompt> <userinput>hg commit -m '419 scam, with son'</userinput> 1.24 +</screen>