annotate it/examples/ch04-resolve.cifail.it @ 977:719b03ea27c8
merge with Italian, and very (few) work on ch03
| author |
Romain PELISSE <belaran@gmail.com> |
| date |
Fri Sep 04 16:33:46 2009 +0200 (2009-09-04) |
| parents |
713f0f69029a 5bbebcdfb533 |
| children |
|
| rev |
line source |
|
Giulio@790
|
1 <!-- BEGIN ch04/resolve.cifail -->
|
|
gpiancastelli@850
|
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 -->
|
