hgbook

diff en/examples/results/backout.non-tip.backout.out @ 591:b788b405e141

find changesets by author, revision, files, or words in the commit message
Replace uses of <informalfigure> with <figure>
author Bryan O'Sullivan <bos@serpentine.com>
date Thu Mar 26 21:07:39 2009 -0700 (2009-03-26)
parents 44d1363234d2
children 4432ad34b8e5
line diff
     1.1 --- a/en/examples/results/backout.non-tip.backout.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/backout.non-tip.backout.out	Thu Mar 26 21:07:39 2009 -0700
     1.3 @@ -1,6 +1,6 @@
     1.4 -$ \textbf{echo third change >> myfile}
     1.5 -$ \textbf{hg commit -m 'third change'}
     1.6 -$ \textbf{hg backout --merge -m 'back out second change' 1}
     1.7 +<screen><prompt>$</prompt> <userinput>echo third change &gt;&gt; myfile</userinput>
     1.8 +<prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput>
     1.9 +<prompt>$</prompt> <userinput>hg backout --merge -m 'back out second change' 1</userinput>
    1.10  reverting myfile
    1.11  created new head
    1.12  changeset  backs out changeset 
    1.13 @@ -8,3 +8,4 @@
    1.14  merging myfile
    1.15  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    1.16  (branch merge, don't forget to commit)
    1.17 +</screen>