Source

hgbook / it / examples / branch-named.merge.it

Giu...@puck 5b79834 





gpiancastelli 5bbebcd 
Giu...@puck 5b79834 

gpiancastelli 7252e7b 






Giu...@puck 5b79834 

<!-- BEGIN branch-named.merge -->
<screen><prompt>$</prompt> <userinput>hg branch</userinput>
bar
<prompt>$</prompt> <userinput>hg merge foo</userinput>
1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
(unione tra rami, ricordatevi di effettuare il commit)
<prompt>$</prompt> <userinput>hg commit -m "Unione."</userinput>
<prompt>$</prompt> <userinput>hg tip</userinput>
changeset:   4:f50f493d0dc0
ramo:        bar
etichetta:   tip
genitore:    2:4dce38140953
genitore:    3:859c842ea668
utente:      Bryan O'Sullivan &lt;bos@serpentine.com&gt;
data:        Fri Jun 05 15:49:06 2009 +0000
sommario:    Unione.

</screen>
<!-- END branch-named.merge -->
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.