hgbook
annotate it/examples/ch04-resolve.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 | |
children |
rev | line source |
---|---|
Giulio@790 | 1 <!-- BEGIN ch04/resolve.merge --> |
Giulio@790 | 2 <screen><prompt>$</prompt> <userinput>hg merge</userinput> |
Giulio@790 | 3 unisco miofile.txt |
Giulio@790 | 4 merge: attenzione: conflitti durante l'unione |
Giulio@790 | 5 unione di miofile.txt fallita! |
Giulio@790 | 6 0 file aggiornati, 0 file uniti, 0 file rimossi, 1 file irrisolti |
Giulio@790 | 7 usate 'hg resolve' per riprovare a unire i file irrisolti o 'hg up --clean' per abbandonare |
Giulio@790 | 8 </screen> |
Giulio@790 | 9 <!-- END ch04/resolve.merge --> |