# HG changeset patch
# User Giulio@puck
# Date 1250006880 -7200
# Node ID d511cb890aa905732636dcfdcc2a588c8017655e
# Parent  c09a6231bc79a948c814f908619c63a21a9d9764
Better translation of Mercurial abort message.

diff -r c09a6231bc79 -r d511cb890aa9 it/examples/tour.merge.update.it
--- a/it/examples/tour.merge.update.it	Mon Aug 10 22:03:09 2009 +0200
+++ b/it/examples/tour.merge.update.it	Tue Aug 11 18:08:00 2009 +0200
@@ -1,6 +1,5 @@
 <!-- BEGIN tour.merge.update -->
 <screen><prompt>$</prompt> <userinput>hg update</userinput>
-abortito: attraversa i rami (usate 'hg merge' o 'hg update -C')
-<!-- in realtà... "aborto", n. più che agg. o p.p. -->
+fallimento: attraversa i rami (usate 'hg merge' o 'hg update -C')
 </screen>
 <!-- END tour.merge.update -->