hgbook / it / examples / tour.merge.update.it

Giu...@puck 0bf0bf6 

Giu...@puck d511cb8 
Giu...@puck 0bf0bf6 
<!-- BEGIN tour.merge.update -->
<screen><prompt>$</prompt> <userinput>hg update</userinput>
fallimento: attraversa i rami (usate 'hg merge' o 'hg update -C')
<!-- END tour.merge.update -->
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.