hgbook
annotate it/examples/tour.merge.merge.it @ 812:42e2c9d47ef4
Minor changes and translation of code snippets for Ch.12.
| author | Giulio@puck |
|---|---|
| date | Sat Aug 15 15:15:39 2009 +0200 (2009-08-15) |
| parents | 0bf0bf61493e |
| children | 719b03ea27c8 |
| 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 --> |