annotate en/examples/results/backout.manual.merge.out @ 564:0d5935744f87
Switch from LaTeX to XML for examples.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Mon Mar 09 21:39:23 2009 -0700 (2009-03-09) |
| parents |
44d1363234d2 |
| children |
4432ad34b8e5 |
| rev |
line source |
|
bos@564
|
1 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
|
|
bos@144
|
2 merging myfile
|
|
bos@144
|
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
bos@144
|
4 (branch merge, don't forget to commit)
|
|
bos@564
|
5 <prompt>$</prompt> <userinput>hg commit -m 'merged backout with previous tip'</userinput>
|
|
bos@564
|
6 <prompt>$</prompt> <userinput>cat myfile</userinput>
|
|
bos@179
|
7 first change
|
|
bos@144
|
8 third change
|
|
bos@564
|
9 </screen>
|
