hgbook
annotate it/examples/tour.merge.merge.it @ 1011:a05a5ae66c38
merge
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Mon Nov 23 10:51:14 2009 +0100 (2009-11-23) |
| 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 --> |