hgbook
diff it/examples/tour-merge-conflict.wife.it @ 834:4142ed700d56
Typo.
author | gpiancastelli |
---|---|
date | Tue Aug 18 17:42:16 2009 +0200 (2009-08-18) |
parents | 0bf0bf61493e |
children | 11a6ba60bb9e |
line diff
1.1 --- a/it/examples/tour-merge-conflict.wife.it Mon Aug 10 21:59:18 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 > lettera.txt <<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>