annotate it/examples/tour.merge.update.it @ 1111:6af721dff19a
chapter 2 zh translated
| author |
Zhaoping Sun <zhaopingsun@gmail.com> |
| date |
Mon Dec 28 22:54:47 2009 -0500 (2009-12-28) |
| 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 -->
|
