hgbook
diff 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 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/it/examples/tour.merge.merge.it Mon Aug 10 21:59:18 2009 +0200 1.3 @@ -0,0 +1,7 @@ 1.4 +<!-- BEGIN tour.merge.merge --> 1.5 +<screen><prompt>$</prompt> <userinput>hg merge</userinput> 1.6 +unisco hello.c 1.7 +0 file aggiornati, 1 file uniti, 0 file rimossi, 0 file irrisolti 1.8 +(unione di rami, ricordatevi di eseguire il commit) 1.9 +</screen> 1.10 +<!-- END tour.merge.merge -->