hgbook

annotate it/examples/tour-merge-conflict.wife.it @ 846:29b47af6a275

find changesets by author, revision, files, or words in the commit message
Adding KDiff3 screenshot.
author gpiancastelli
date Sat Aug 22 17:02:37 2009 +0200 (2009-08-22)
parents 4142ed700d56
children 719b03ea27c8
rev   line source
Giulio@785 1 <!-- BEGIN tour-merge-conflict.wife -->
Giulio@785 2 <screen><prompt>$</prompt> <userinput>cat &gt; lettera.txt &lt;&lt;EOF</userinput>
Giulio@785 3 <prompt>></prompt> <userinput>Salve!</userinput>
gpiancastelli@834 4 <prompt>></prompt> <userinput>Sono Mariam Abacha, moglie dell'ex</userinput>
Giulio@785 5 <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
Giulio@785 6 <prompt>></prompt> <userinput>EOF</userinput>
gpiancastelli@836 7 <prompt>$</prompt> <userinput>hg add lettera.txt</userinput>
Giulio@785 8 <prompt>$</prompt> <userinput>hg commit -m 'truffa 419, prima bozza'</userinput>
Giulio@785 9 </screen>
Giulio@785 10 <!-- END tour-merge-conflict.wife -->