hgbook
annotate it/examples/tour-merge-conflict.wife.it @ 1114:527b86d55d4a
inotify: update installation information
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
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 | 713f0f69029a 11a6ba60bb9e |
children |
rev | line source |
---|---|
Giulio@785 | 1 <!-- BEGIN tour-merge-conflict.wife --> |
Giulio@785 | 2 <screen><prompt>$</prompt> <userinput>cat > lettera.txt <<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 --> |