# HG changeset patch
# User Giulio@puck
# Date 1250010129 -7200
# Node ID 1bd3a2ecb828b71c082b445a180b8ce6351e0076
# Parent  d511cb890aa905732636dcfdcc2a588c8017655e
Wording.

diff -r d511cb890aa9 -r 1bd3a2ecb828 it/examples/tour.merge.merge.it
--- a/it/examples/tour.merge.merge.it	Tue Aug 11 18:08:00 2009 +0200
+++ b/it/examples/tour.merge.merge.it	Tue Aug 11 19:02:09 2009 +0200
@@ -2,6 +2,6 @@
 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
 unisco hello.c
 0 file aggiornati, 1 file uniti, 0 file rimossi, 0 file irrisolti
-(unione di rami, ricordatevi di eseguire il commit)
+(unione tra rami, ricordatevi di eseguire il commit)
 </screen>
 <!-- END tour.merge.merge -->