hgbook
annotate it/examples/ch04-resolve.init.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.init --> |
Giulio@790 | 2 <screen><prompt>$</prompt> <userinput>hg init conflitto</userinput> |
Giulio@790 | 3 <prompt>$</prompt> <userinput>cd conflitto</userinput> |
Giulio@790 | 4 <prompt>$</prompt> <userinput>echo primo > miofile.txt</userinput> |
Giulio@790 | 5 <prompt>$</prompt> <userinput>hg ci -A -m primo</userinput> |
Giulio@790 | 6 aggiungo miofile.txt |
Giulio@790 | 7 <prompt>$</prompt> <userinput>cd ..</userinput> |
Giulio@790 | 8 <prompt>$</prompt> <userinput>hg clone conflitto sinistra</userinput> |
Giulio@790 | 9 aggiorno la directory di lavoro |
Giulio@790 | 10 1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti |
Giulio@790 | 11 <prompt>$</prompt> <userinput>hg clone conflitto destra</userinput> |
Giulio@790 | 12 aggiorno la directory di lavoro |
Giulio@790 | 13 1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti |
Giulio@790 | 14 </screen> |
Giulio@790 | 15 <!-- END ch04/resolve.init --> |