hgbook
view it/examples/backout.manual.merge.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 5bbebcdfb533 |
children |
line source
1 <!-- BEGIN backout.manual.merge -->
2 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
3 unisco miofile
4 0 file aggiornati, 1 file uniti, 0 file rimossi, 0 file irrisolti
5 (unione tra rami, ricordatevi di eseguire il commit)
6 <prompt>$</prompt> <userinput>hg commit -m "Unisce il changeset che ha compiuto il ritiro con la punta precedente."</userinput>
7 <prompt>$</prompt> <userinput>cat miofile</userinput>
8 prima modifica
9 terza modifica
10 </screen>
11 <!-- END backout.manual.merge -->