hgbook

annotate it/examples/tour-merge-conflict.wife.it @ 785:0bf0bf61493e

find changesets by author, revision, files, or words in the commit message
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
rev   line source
Giulio@785 1 <!-- BEGIN tour-merge-conflict.wife -->
Giulio@785 2 <screen><prompt>$</prompt> <userinput>cat &gt; lettera.txt &lt;&lt;EOF</userinput>
Giulio@785 3 <prompt>></prompt> <userinput>Salve!</userinput>
Giulio@785 4 <prompt>></prompt> <userinput>Sono Mariam Abacha, la moglie dell'ex</userinput>
Giulio@785 5 <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
Giulio@785 6 <prompt>></prompt> <userinput>EOF</userinput>
Giulio@785 7 <prompt>$</prompt> <userinput>hg add letter.txt</userinput>
Giulio@785 8 <prompt>$</prompt> <userinput>hg commit -m 'truffa 419, prima bozza'</userinput>
Giulio@785 9 </screen>
Giulio@785 10 <!-- END tour-merge-conflict.wife -->