hgbook
view it/examples/tour-merge-conflict.wife.it @ 785:0bf0bf61493e
Minor changes and translation of code snippets for Ch.3.
| author | Giulio@puck |
|---|---|
| date | Mon Aug 10 21:59:18 2009 +0200 (2009-08-10) |
| parents | |
| children | 4142ed700d56 |
line source
1 <!-- BEGIN tour-merge-conflict.wife -->
2 <screen><prompt>$</prompt> <userinput>cat > lettera.txt <<EOF</userinput>
3 <prompt>></prompt> <userinput>Salve!</userinput>
4 <prompt>></prompt> <userinput>Sono Mariam Abacha, la moglie dell'ex</userinput>
5 <prompt>></prompt> <userinput>dittatore nigeriano 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 'truffa 419, prima bozza'</userinput>
9 </screen>
10 <!-- END tour-merge-conflict.wife -->