hgbook

diff it/examples/ch04-resolve.cifail.it @ 790:3d5e63d5d180

find changesets by author, revision, files, or words in the commit message
Minor changes and translation of code snippets for Ch.5.
author Giulio@puck
date Tue Aug 11 21:53:03 2009 +0200 (2009-08-11)
parents
children 5bbebcdfb533
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/ch04-resolve.cifail.it	Tue Aug 11 21:53:03 2009 +0200
     1.3 @@ -0,0 +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 +fallimento: conflitti di unione irrisolti (si veda hg resolve)
     1.7 +</screen>
     1.8 +<!-- END ch04/resolve.cifail -->