hgbook

diff 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 diff
     1.1 --- a/it/examples/ch04-resolve.cifail.it	Tue Aug 11 21:53:03 2009 +0200
     1.2 +++ b/it/examples/ch04-resolve.cifail.it	Tue Nov 10 19:48:42 2009 -0500
     1.3 @@ -1,5 +1,5 @@
     1.4  <!-- BEGIN ch04/resolve.cifail -->
     1.5 -<screen><prompt>$</prompt> <userinput>hg commit -m 'Tentativo di inserire i risultati di un'unione fallita.'</userinput>
     1.6 +<screen><prompt>$</prompt> <userinput>hg commit -m "Tentativo di inserire i risultati di un'unione fallita."</userinput>
     1.7  fallimento: conflitti di unione irrisolti (si veda hg resolve)
     1.8  </screen>
     1.9  <!-- END ch04/resolve.cifail -->