annotate it/examples/ch04-resolve.cifail.it @ 917:93154fbaae9b
Merge with http://bitbucket.org/dukebody/hgbook-alqua/
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Tue Oct 27 21:31:06 2009 -0700 (2009-10-27) |
| parents |
3d5e63d5d180 |
| children |
719b03ea27c8 |
| 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 -->
|
