hgbook
annotate it/examples/tour.merge.update.it @ 996:6f8c48362758
merge with trunk
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Sat Sep 12 17:58:56 2009 +0200 (2009-09-12) |
parents | 713f0f69029a d511cb890aa9 |
children |
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 --> |