Mercurial > hgbook
annotate en/examples/results/tour-merge-conflict.wife.out @ 709:4432ad34b8e5
Check in example outputs with begin/end markers.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 31 Mar 2009 12:19:01 -0700 |
parents | 0d5935744f87 |
children |
rev | line source |
---|---|
709
4432ad34b8e5
Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents:
663
diff
changeset
|
1 <!-- BEGIN tour-merge-conflict.wife --> |
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
2 <screen><prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
3 <prompt>></prompt> <userinput>Greetings!</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
4 <prompt>></prompt> <userinput>I am Mariam Abacha, the wife of former</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
5 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
6 <prompt>></prompt> <userinput>EOF</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
7 <prompt>$</prompt> <userinput>hg add letter.txt</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
8 <prompt>$</prompt> <userinput>hg commit -m '419 scam, first draft'</userinput> |
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
9 </screen> |
709
4432ad34b8e5
Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents:
663
diff
changeset
|
10 <!-- END tour-merge-conflict.wife --> |