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