hgbook

view it/examples/tour-merge-conflict.cousin.it @ 1114:527b86d55d4a

find changesets by author, revision, files, or words in the commit message
inotify: update installation information

inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sun Dec 13 16:35:56 2009 +0900 (2009-12-13)
parents
children
line source
1 <!-- BEGIN tour-merge-conflict.cousin -->
2 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
3 <prompt>$</prompt> <userinput>hg clone truffa truffa-cugino</userinput>
4 aggiorno la directory di lavoro
5 1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
6 <prompt>$</prompt> <userinput>cd truffa-cugino</userinput>
7 <prompt>$</prompt> <userinput>cat &gt; lettera.txt &lt;&lt;EOF</userinput>
8 <prompt>></prompt> <userinput>Salve!</userinput>
9 <prompt>></prompt> <userinput>Sono Shehu Musa Abacha, cugino dell'ex</userinput>
10 <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
11 <prompt>></prompt> <userinput>EOF</userinput>
12 <prompt>$</prompt> <userinput>hg commit -m 'truffa 419, con cugino'</userinput>
13 </screen>
14 <!-- END tour-merge-conflict.cousin -->