hgbook
view en/examples/results/tour-merge-conflict.wife.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.wife -->
2 <screen><prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput>
3 <prompt>></prompt> <userinput>Greetings!</userinput>
4 <prompt>></prompt> <userinput>I am Mariam Abacha, the wife of former</userinput>
5 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
6 <prompt>></prompt> <userinput>EOF</userinput>
7 <prompt>$</prompt> <userinput>hg add letter.txt</userinput>
8 <prompt>$</prompt> <userinput>hg commit -m '419 scam, first draft'</userinput>
9 </screen>
10 <!-- END tour-merge-conflict.wife -->