hgbook
view en/examples/results/backout.non-tip.backout.out @ 591:b788b405e141
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 source
1 <screen><prompt>$</prompt> <userinput>echo third change >> myfile</userinput>
2 <prompt>$</prompt> <userinput>hg commit -m 'third change'</userinput>
3 <prompt>$</prompt> <userinput>hg backout --merge -m 'back out second change' 1</userinput>
4 reverting myfile
5 created new head
6 changeset backs out changeset
7 merging with changeset
8 merging myfile
9 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
10 (branch merge, don't forget to commit)
11 </screen>