hgbook
diff it/examples/tour.merge.update.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 | d511cb890aa9 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/it/examples/tour.merge.update.it Mon Aug 10 21:59:18 2009 +0200 1.3 @@ -0,0 +1,6 @@ 1.4 +<!-- BEGIN tour.merge.update --> 1.5 +<screen><prompt>$</prompt> <userinput>hg update</userinput> 1.6 +abortito: attraversa i rami (usate 'hg merge' o 'hg update -C') 1.7 +<!-- in realtà ... "aborto", n. più che agg. o p.p. --> 1.8 +</screen> 1.9 +<!-- END tour.merge.update -->