hgbook

annotate it/examples/ch04-resolve.cifail.it @ 1052:c8b5a06543c0

find changesets by author, revision, files, or words in the commit message
cvs section translated
author zhaopingsun
date Tue Nov 10 16:25:43 2009 -0500 (2009-11-10)
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 -->