hgbook

diff it/examples/backout.non-tip.backout.it @ 1085:b71b3f734904

2.4.2 first para unfinished
author Zhaoping Sun <zhaopingsun@gmail.com>
date Fri Nov 20 23:21:46 2009 -0500 (2009-11-20)
parents d4de8d288ba6
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/backout.non-tip.backout.it	Wed Aug 12 23:47:08 2009 +0200
     1.2 +++ b/it/examples/backout.non-tip.backout.it	Fri Nov 20 23:21:46 2009 -0500
     1.3 @@ -1,7 +1,7 @@
     1.4  <!-- BEGIN backout.non-tip.backout -->
     1.5  <screen><prompt>$</prompt> <userinput>echo terza modifica &gt;&gt; miofile</userinput>
     1.6 -<prompt>$</prompt> <userinput>hg commit -m 'Terza modifica.'</userinput>
     1.7 -<prompt>$</prompt> <userinput>hg backout --merge -m 'Ritira la seconda modifica.' 1</userinput>
     1.8 +<prompt>$</prompt> <userinput>hg commit -m "Terza modifica."</userinput>
     1.9 +<prompt>$</prompt> <userinput>hg backout --merge -m "Ritira la seconda modifica." 1</userinput>
    1.10  ripristino miofile
    1.11  creata una nuova testa
    1.12  il changeset 3:af281715005d ritira il changeset 1:51969da8cdc5