Source

hgbook / it / examples / issue29.go.it

Giu...@puck 3d5e63d 
















gpiancastelli 0a49072 
Giu...@puck 3d5e63d 
<!-- BEGIN issue29.go -->
<screen><prompt>$</prompt> <userinput>hg init problema29</userinput>
<prompt>$</prompt> <userinput>cd problema29</userinput>
<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
<prompt>$</prompt> <userinput>hg ci -Ama</userinput>
aggiungo a
<prompt>$</prompt> <userinput>echo b &gt; b</userinput>
<prompt>$</prompt> <userinput>hg ci -Amb</userinput>
aggiungo b
<prompt>$</prompt> <userinput>hg up 0</userinput>
0 file aggiornati, 0 file uniti, 1 file rimossi, 0 file irrisolti
<prompt>$</prompt> <userinput>mkdir b</userinput>
<prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
<prompt>$</prompt> <userinput>hg ci -Amc</userinput>
aggiungo b/b
creata una nuova testa
<prompt>$</prompt> <userinput>hg merge</userinput>
fallimento: è una directory: /tmp/problema29/b
</screen>
<!-- END issue29.go -->
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.