annotate 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 |
rev |
line source |
bos@564
|
1 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
|
bos@564
|
2 <prompt>$</prompt> <userinput>hg clone scam scam-son</userinput>
|
hg@302
|
3 updating working directory
|
bos@144
|
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
bos@564
|
5 <prompt>$</prompt> <userinput>cd scam-son</userinput>
|
bos@564
|
6 <prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput>
|
bos@564
|
7 <prompt>></prompt> <userinput>Greetings!</userinput>
|
bos@564
|
8 <prompt>></prompt> <userinput>I am Alhaji Abba Abacha, son of the former</userinput>
|
bos@564
|
9 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
|
bos@564
|
10 <prompt>></prompt> <userinput>EOF</userinput>
|
bos@564
|
11 <prompt>$</prompt> <userinput>hg commit -m '419 scam, with son'</userinput>
|
bos@564
|
12 </screen>
|