hgbook
view it/examples/branch-named.merge.it @ 840:7252e7b7f07d
Final editing for chapters 8-11.
| author | gpiancastelli |
|---|---|
| date | Fri Aug 21 22:29:44 2009 +0200 (2009-08-21) |
| parents | 5b79834be9a6 |
| children | 5bbebcdfb533 |
line source
1 <!-- BEGIN branch-named.merge -->
2 <screen><prompt>$</prompt> <userinput>hg branch</userinput>
3 bar
4 <prompt>$</prompt> <userinput>hg merge foo</userinput>
5 1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
6 (unione tra rami, ricordatevi di effettuare il commit)
7 <prompt>$</prompt> <userinput>hg commit -m 'Unione.'</userinput>
8 <prompt>$</prompt> <userinput>hg tip</userinput>
9 changeset: 4:f50f493d0dc0
10 ramo: bar
11 etichetta: tip
12 genitore: 2:4dce38140953
13 genitore: 3:859c842ea668
14 utente: Bryan O'Sullivan <bos@serpentine.com>
15 data: Fri Jun 05 15:49:06 2009 +0000
16 sommario: Unione.
18 </screen>
19 <!-- END branch-named.merge -->