hgbook
annotate it/examples/tour.merge.merge.it @ 785:0bf0bf61493e
Minor changes and translation of code snippets for Ch.3.
author | Giulio@puck |
---|---|
date | Mon Aug 10 21:59:18 2009 +0200 (2009-08-10) |
parents | |
children | 1bd3a2ecb828 |
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@785 | 5 (unione di rami, ricordatevi di eseguire il commit) |
Giulio@785 | 6 </screen> |
Giulio@785 | 7 <!-- END tour.merge.merge --> |