annotate it/examples/ch04-resolve.cifail.it @ 791:bf84d6b2281c
Minor changes and translation of code snippets for Ch.7.
| author |
Giulio@puck |
| date |
Tue Aug 11 23:01:30 2009 +0200 (2009-08-11) |
| parents |
|
| children |
5bbebcdfb533 |
| rev |
line source |
|
Giulio@790
|
1 <!-- BEGIN ch04/resolve.cifail -->
|
|
Giulio@790
|
2 <screen><prompt>$</prompt> <userinput>hg commit -m 'Tentativo di inserire i risultati di un'unione fallita.'</userinput>
|
|
Giulio@790
|
3 fallimento: conflitti di unione irrisolti (si veda hg resolve)
|
|
Giulio@790
|
4 </screen>
|
|
Giulio@790
|
5 <!-- END ch04/resolve.cifail -->
|
