hgbook
view it/examples/tour-merge-conflict.wife.it @ 1038:aafcc7f42da9
1.4.2 zh translated
| author | Zhaoping Sun <zhaopingsun@gmail.com> |
|---|---|
| date | Sun Nov 08 16:35:47 2009 -0500 (2009-11-08) |
| parents | 4142ed700d56 |
| children | 719b03ea27c8 |
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 -->