annotate en/examples/results/tour-merge-conflict.cousin.out @ 614:c8680784cdbb
Make builds more reliable.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Tue Mar 31 15:35:44 2009 -0700 (2009-03-31) |
| parents |
0d5935744f87 |
| children |
|
| rev |
line source |
|
bos@611
|
1 <!-- BEGIN tour-merge-conflict.cousin -->
|
|
bos@564
|
2 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
|
|
bos@564
|
3 <prompt>$</prompt> <userinput>hg clone scam scam-cousin</userinput>
|
|
hg@302
|
4 updating working directory
|
|
bos@144
|
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@564
|
6 <prompt>$</prompt> <userinput>cd scam-cousin</userinput>
|
|
bos@564
|
7 <prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput>
|
|
bos@564
|
8 <prompt>></prompt> <userinput>Greetings!</userinput>
|
|
bos@564
|
9 <prompt>></prompt> <userinput>I am Shehu Musa Abacha, cousin to the former</userinput>
|
|
bos@564
|
10 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
|
|
bos@564
|
11 <prompt>></prompt> <userinput>EOF</userinput>
|
|
bos@564
|
12 <prompt>$</prompt> <userinput>hg commit -m '419 scam, with cousin'</userinput>
|
|
bos@564
|
13 </screen>
|
|
bos@611
|
14 <!-- END tour-merge-conflict.cousin -->
|
