1.1 --- a/it/examples/tour-merge-conflict.wife.it	Tue Aug 18 17:31:11 2009 +0200
     1.2 +++ b/it/examples/tour-merge-conflict.wife.it	Tue Aug 18 17:42:16 2009 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  <!-- BEGIN tour-merge-conflict.wife -->
     1.5  <screen><prompt>$</prompt> <userinput>cat &gt; lettera.txt &lt;&lt;EOF</userinput>
     1.6  <prompt>></prompt> <userinput>Salve!</userinput>
     1.7 -<prompt>></prompt> <userinput>Sono Mariam Abacha, la moglie dell'ex</userinput>
     1.8 +<prompt>></prompt> <userinput>Sono Mariam Abacha, moglie dell'ex</userinput>
     1.9  <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
    1.10  <prompt>></prompt> <userinput>EOF</userinput>
    1.11  <prompt>$</prompt> <userinput>hg add letter.txt</userinput>