Giulio@790: <!-- BEGIN issue29.go -->
Giulio@790: <screen><prompt>$</prompt> <userinput>hg init problema29</userinput>
Giulio@790: <prompt>$</prompt> <userinput>cd problema29</userinput>
Giulio@790: <prompt>$</prompt> <userinput>echo a &gt; a</userinput>
Giulio@790: <prompt>$</prompt> <userinput>hg ci -Ama</userinput>
Giulio@790: aggiungo a
Giulio@790: <prompt>$</prompt> <userinput>echo b &gt; b</userinput>
Giulio@790: <prompt>$</prompt> <userinput>hg ci -Amb</userinput>
Giulio@790: aggiungo b
Giulio@790: <prompt>$</prompt> <userinput>hg up 0</userinput>
Giulio@790: 0 file aggiornati, 0 file uniti, 1 file rimossi, 0 file irrisolti
Giulio@790: <prompt>$</prompt> <userinput>mkdir b</userinput>
Giulio@790: <prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
Giulio@790: <prompt>$</prompt> <userinput>hg ci -Amc</userinput>
Giulio@790: aggiungo b/b
Giulio@790: creata una nuova testa
Giulio@790: <prompt>$</prompt> <userinput>hg merge</userinput>
gpiancastelli@839: fallimento: è una directory: /tmp/problema29/b
Giulio@790: </screen>
Giulio@790: <!-- END issue29.go -->