hgbook

diff it/examples/backout.manual.merge.it @ 839:0a49072e8c7f

find changesets by author, revision, files, or words in the commit message
Final editing for chapters 4-7.
author gpiancastelli
date Fri Aug 21 21:42:22 2009 +0200 (2009-08-21)
parents
children efa16e810ae6
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/backout.manual.merge.it	Fri Aug 21 21:42:22 2009 +0200
     1.3 @@ -0,0 +1,8 @@
     1.4 +<!-- BEGIN backout.manual.merge -->
     1.5 +<screen><prompt>$</prompt> <userinput>hg merge</userinput>
     1.6 +fallimento: modifiche in sospeso non registrate
     1.7 +<prompt>$</prompt> <userinput>hg commit -m 'Unisce il changeset che ha compiuto il ritiro con la punta precedente.'</userinput>
     1.8 +<prompt>$</prompt> <userinput>cat miofile</userinput>
     1.9 +prima modifica
    1.10 +</screen>
    1.11 +<!-- END backout.manual.merge -->