hgbook
view en/examples/results/tour-merge-conflict.son.out @ 611:4432ad34b8e5
Check in example outputs with begin/end markers.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Mar 31 12:19:01 2009 -0700 (2009-03-31) |
| parents | 0d5935744f87 |
| children |
line source
1 <!-- BEGIN tour-merge-conflict.son -->
2 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
3 <prompt>$</prompt> <userinput>hg clone scam scam-son</userinput>
4 updating working directory
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6 <prompt>$</prompt> <userinput>cd scam-son</userinput>
7 <prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput>
8 <prompt>></prompt> <userinput>Greetings!</userinput>
9 <prompt>></prompt> <userinput>I am Alhaji Abba Abacha, son of the former</userinput>
10 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
11 <prompt>></prompt> <userinput>EOF</userinput>
12 <prompt>$</prompt> <userinput>hg commit -m '419 scam, with son'</userinput>
13 </screen>
14 <!-- END tour-merge-conflict.son -->