hgbook
view it/examples/tour-merge-conflict.pull.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 11a6ba60bb9e |
| children |
line source
1 <!-- BEGIN tour-merge-conflict.pull -->
2 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
3 <prompt>$</prompt> <userinput>hg clone truffa-cugino truffa-unione</userinput>
4 aggiorno la directory di lavoro
5 1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
6 <prompt>$</prompt> <userinput>cd truffa-unione</userinput>
7 <prompt>$</prompt> <userinput>hg pull -u ../truffa-figlio</userinput>
8 estraggo da ../truffa-figlio
9 cerco i cambiamenti
10 aggiungo i changeset
11 aggiungo i manifest
12 aggiungo i cambiamenti ai file
13 aggiunti 1 changeset con 1 cambiamenti a 1 file (+1 teste)
14 non aggiorno, sono state aggiunte nuove teste
15 (eseguite 'hg heads' per vedere le teste, 'hg merge' per unire)
16 </screen>
17 <!-- END tour-merge-conflict.pull -->