hgbook

diff it/examples/mq.dodiff.diff.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/mq.dodiff.diff.it	Fri Sep 04 16:33:35 2009 +0200
     1.3 @@ -0,0 +1,16 @@
     1.4 +<!-- BEGIN mq.dodiff.diff -->
     1.5 +<screen><prompt>$</prompt> <userinput>echo 'questo è il mio primo pensiero' &gt; vecchiofile</userinput>
     1.6 +<prompt>$</prompt> <userinput>echo 'ho cambiato idea' &gt; nuovofile</userinput>
     1.7 +<prompt>$</prompt> <userinput>diff -u vecchiofile nuovofile &gt; piccola.patch</userinput>
     1.8 +<prompt>$</prompt> <userinput>cat piccola.patch</userinput>
     1.9 +--- vecchiofile	2009-06-05 15:50:32.000000000 +0000
    1.10 ++++ nuovofile	2009-06-05 15:50:32.000000000 +0000
    1.11 +@@ -1 +1 @@
    1.12 +-questo è il mio primo pensiero
    1.13 ++ho cambiato idea
    1.14 +<prompt>$</prompt> <userinput>patch &lt; piccola.patch</userinput>
    1.15 +correggo il file vecchiofile
    1.16 +<prompt>$</prompt> <userinput>cat vecchiofile</userinput>
    1.17 +ho cambiato idea
    1.18 +</screen>
    1.19 +<!-- END mq.dodiff.diff -->