hgbook

diff it/examples/tour.merge.update.it @ 805:c35067358254

find changesets by author, revision, files, or words in the commit message
Minor adjustments to code snippets for diffs and temporary directory.
author Giulio@puck
date Sat Aug 15 03:10:19 2009 +0200 (2009-08-15)
parents 0bf0bf61493e
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/tour.merge.update.it	Mon Aug 10 21:59:18 2009 +0200
     1.2 +++ b/it/examples/tour.merge.update.it	Sat Aug 15 03:10:19 2009 +0200
     1.3 @@ -1,6 +1,5 @@
     1.4  <!-- BEGIN tour.merge.update -->
     1.5  <screen><prompt>$</prompt> <userinput>hg update</userinput>
     1.6 -abortito: attraversa i rami (usate 'hg merge' o 'hg update -C')
     1.7 -<!-- in realtà... "aborto", n. più che agg. o p.p. -->
     1.8 +fallimento: attraversa i rami (usate 'hg merge' o 'hg update -C')
     1.9  </screen>
    1.10  <!-- END tour.merge.update -->