hgbook
annotate it/examples/tour.merge.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 1bd3a2ecb828 |
children |
rev | line source |
---|---|
Giulio@785 | 1 <!-- BEGIN tour.merge.merge --> |
Giulio@785 | 2 <screen><prompt>$</prompt> <userinput>hg merge</userinput> |
Giulio@785 | 3 unisco hello.c |
Giulio@785 | 4 0 file aggiornati, 1 file uniti, 0 file rimossi, 0 file irrisolti |
Giulio@788 | 5 (unione tra rami, ricordatevi di eseguire il commit) |
Giulio@785 | 6 </screen> |
Giulio@785 | 7 <!-- END tour.merge.merge --> |