hgbook

diff it/examples/tour-merge-conflict.son.it @ 976:713f0f69029a

find changesets by author, revision, files, or words in the commit message
merge with Italian, and very (few) work on ch03
author Romain PELISSE <belaran@gmail.com>
date Fri Sep 04 16:33:35 2009 +0200 (2009-09-04)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/tour-merge-conflict.son.it	Fri Sep 04 16:33:35 2009 +0200
     1.3 @@ -0,0 +1,14 @@
     1.4 +<!-- BEGIN tour-merge-conflict.son -->
     1.5 +<screen><prompt>$</prompt> <userinput>cd ..</userinput>
     1.6 +<prompt>$</prompt> <userinput>hg clone truffa truffa-figlio</userinput>
     1.7 +aggiorno la directory di lavoro
     1.8 +1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
     1.9 +<prompt>$</prompt> <userinput>cd truffa-figlio</userinput>
    1.10 +<prompt>$</prompt> <userinput>cat &gt; lettera.txt &lt;&lt;EOF</userinput>
    1.11 +<prompt>></prompt> <userinput>Salve!</userinput>
    1.12 +<prompt>></prompt> <userinput>Sono Alhaji Abba Abacha, figlio dell'ex</userinput>
    1.13 +<prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
    1.14 +<prompt>></prompt> <userinput>EOF</userinput>
    1.15 +<prompt>$</prompt> <userinput>hg commit -m 'truffa 419, con figlio'</userinput>
    1.16 +</screen>
    1.17 +<!-- END tour-merge-conflict.son -->