hgbook

view it/examples/ch04-resolve.cifail.it @ 1055:4f899bb4d0dd

find changesets by author, revision, files, or words in the commit message
1.6.5 refined
author zhaopingsun
date Tue Nov 10 19:48:42 2009 -0500 (2009-11-10)
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)
4 </screen>
5 <!-- END ch04/resolve.cifail -->