view it/examples/ch04-resolve.cifail.it @ 1034:0525fc68b7fe
Update po files with source xml files
| author |
Dongsheng Song <dongsheng.song@gmail.com> |
| date |
Wed Nov 04 14:11:14 2009 +0800 (2009-11-04) |
| parents |
3d5e63d5d180 |
| children |
719b03ea27c8 |
line source
1 <!-- BEGIN ch04/resolve.cifail -->
2 <screen><prompt>$</prompt> <userinput>hg commit -m "Tentativo di inserire i risultati di un'unione fallita."</userinput>
3 fallimento: conflitti di unione irrisolti (si veda hg resolve)
5 <!-- END ch04/resolve.cifail -->
