hgbook

diff it/examples/tour-merge-conflict.wife.it @ 1085:b71b3f734904

find changesets by author, revision, files, or words in the commit message
2.4.2 first para unfinished
author Zhaoping Sun <zhaopingsun@gmail.com>
date Fri Nov 20 23:21:46 2009 -0500 (2009-11-20)
parents 4142ed700d56
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/tour-merge-conflict.wife.it	Tue Aug 18 17:42:16 2009 +0200
     1.2 +++ b/it/examples/tour-merge-conflict.wife.it	Fri Nov 20 23:21:46 2009 -0500
     1.3 @@ -4,7 +4,7 @@
     1.4  <prompt>></prompt> <userinput>Sono Mariam Abacha, moglie dell'ex</userinput>
     1.5  <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
     1.6  <prompt>></prompt> <userinput>EOF</userinput>
     1.7 -<prompt>$</prompt> <userinput>hg add letter.txt</userinput>
     1.8 +<prompt>$</prompt> <userinput>hg add lettera.txt</userinput>
     1.9  <prompt>$</prompt> <userinput>hg commit -m 'truffa 419, prima bozza'</userinput>
    1.10  </screen>
    1.11  <!-- END tour-merge-conflict.wife -->