hgbook
view it/examples/tour-merge-conflict.wife.it @ 1027:a122f4c9a75b
moving xsl to appropriate folder
| author | Romain Pelisse <belaran@gmail.com> |
|---|---|
| date | Wed Apr 21 18:28:16 2010 +0200 (2010-04-21) |
| parents | 713f0f69029a 11a6ba60bb9e |
| children |
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, 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 lettera.txt</userinput>
8 <prompt>$</prompt> <userinput>hg commit -m 'truffa 419, prima bozza'</userinput>
9 </screen>
10 <!-- END tour-merge-conflict.wife -->