hgbook
annotate it/examples/tour.merge.update.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 d511cb890aa9 |
| children |
| rev | line source |
|---|---|
| Giulio@785 | 1 <!-- BEGIN tour.merge.update --> |
| Giulio@785 | 2 <screen><prompt>$</prompt> <userinput>hg update</userinput> |
| Giulio@787 | 3 fallimento: attraversa i rami (usate 'hg merge' o 'hg update -C') |
| Giulio@785 | 4 </screen> |
| Giulio@785 | 5 <!-- END tour.merge.update --> |