hgbook

diff it/examples/tour.merge.merge.it @ 812:42e2c9d47ef4

find changesets by author, revision, files, or words in the commit message
Minor changes and translation of code snippets for Ch.12.
author Giulio@puck
date Sat Aug 15 15:15:39 2009 +0200 (2009-08-15)
parents 0bf0bf61493e
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/tour.merge.merge.it	Mon Aug 10 21:59:18 2009 +0200
     1.2 +++ b/it/examples/tour.merge.merge.it	Sat Aug 15 15:15:39 2009 +0200
     1.3 @@ -2,6 +2,6 @@
     1.4  <screen><prompt>$</prompt> <userinput>hg merge</userinput>
     1.5  unisco hello.c
     1.6  0 file aggiornati, 1 file uniti, 0 file rimossi, 0 file irrisolti
     1.7 -(unione di rami, ricordatevi di eseguire il commit)
     1.8 +(unione tra rami, ricordatevi di eseguire il commit)
     1.9  </screen>
    1.10  <!-- END tour.merge.merge -->