hgbook
view en/examples/results/tour-merge-conflict.cousin.out @ 590:a2923aa93da9
Fix which files are included in the generated XML.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu Mar 26 20:24:44 2009 -0700 (2009-03-26) |
| parents | 44d1363234d2 |
| children | 4432ad34b8e5 |
line source
1 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
2 <prompt>$</prompt> <userinput>hg clone scam scam-cousin</userinput>
3 updating working directory
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 <prompt>$</prompt> <userinput>cd scam-cousin</userinput>
6 <prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput>
7 <prompt>></prompt> <userinput>Greetings!</userinput>
8 <prompt>></prompt> <userinput>I am Shehu Musa Abacha, cousin to the former</userinput>
9 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
10 <prompt>></prompt> <userinput>EOF</userinput>
11 <prompt>$</prompt> <userinput>hg commit -m '419 scam, with cousin'</userinput>
12 </screen>