Mercurial > hgbook
view en/examples/results/tour-merge-conflict.son.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 |
line wrap: on
line source
<!-- BEGIN tour-merge-conflict.son --> <screen><prompt>$</prompt> <userinput>cd ..</userinput> <prompt>$</prompt> <userinput>hg clone scam scam-son</userinput> updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved <prompt>$</prompt> <userinput>cd scam-son</userinput> <prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput> <prompt>></prompt> <userinput>Greetings!</userinput> <prompt>></prompt> <userinput>I am Alhaji Abba Abacha, son of the former</userinput> <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput> <prompt>></prompt> <userinput>EOF</userinput> <prompt>$</prompt> <userinput>hg commit -m '419 scam, with son'</userinput> </screen> <!-- END tour-merge-conflict.son -->