# HG changeset patch
# User Giulio@puck
# Date 1250014339 -7200
# Node ID a419faec3428a0e1d45fd10afe6f5cb92a40cded
# Parent  1bd3a2ecb828b71c082b445a180b8ce6351e0076
Missing part of a message.

diff -r 1bd3a2ecb828 -r a419faec3428 it/examples/tour-merge-conflict.merge.it
--- a/it/examples/tour-merge-conflict.merge.it	Tue Aug 11 19:02:09 2009 +0200
+++ b/it/examples/tour-merge-conflict.merge.it	Tue Aug 11 20:12:19 2009 +0200
@@ -5,7 +5,7 @@
 merge: attenzione: conflitti durante l'unione
 unione di lettera.txt fallita!
 0 file aggiornati, 0 file uniti, 0 file rimossi, 1 file irrisolti
-usate 'hg resolve' per riprovare a unire i file irrisolti
+usate 'hg resolve' per riprovare a unire i file irrisolti o 'hg up --clean' per abbandonare
 <prompt>$</prompt> <userinput>cat lettera.txt</userinput>
 Salve!
 &lt;&lt;&lt;&lt;&lt;&lt;&lt; /tmp/panoramica-unioni-conflitto/truffa-unione/lettera.txt