hgbook
annotate it/examples/tour.merge.update.it @ 1066:cd081566e692
1.8 refined
| author | Zhaoping Sun <zhaopingsun@gmail.com> |
|---|---|
| date | Wed Nov 11 17:51:44 2009 -0500 (2009-11-11) |
| parents | 0bf0bf61493e |
| children | 719b03ea27c8 |
| rev | line source |
|---|---|
| Giulio@785 | 1 <!-- BEGIN tour.merge.update --> |
| Giulio@785 | 2 <screen><prompt>$</prompt> <userinput>hg update</userinput> |
| Giulio@787 | 3 fallimento: attraversa i rami (usate 'hg merge' o 'hg update -C') |
| Giulio@785 | 4 </screen> |
| Giulio@785 | 5 <!-- END tour.merge.update --> |