annotate en/examples/results/backout.manual.merge.out @ 611:4432ad34b8e5
Check in example outputs with begin/end markers.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Tue Mar 31 12:19:01 2009 -0700 (2009-03-31) |
| parents |
0d5935744f87 |
| children |
|
| rev |
line source |
|
bos@611
|
1 <!-- BEGIN backout.manual.merge -->
|
|
bos@564
|
2 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
|
|
bos@144
|
3 merging myfile
|
|
bos@144
|
4 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
bos@144
|
5 (branch merge, don't forget to commit)
|
|
bos@564
|
6 <prompt>$</prompt> <userinput>hg commit -m 'merged backout with previous tip'</userinput>
|
|
bos@564
|
7 <prompt>$</prompt> <userinput>cat myfile</userinput>
|
|
bos@179
|
8 first change
|
|
bos@144
|
9 third change
|
|
bos@564
|
10 </screen>
|
|
bos@611
|
11 <!-- END backout.manual.merge -->
|
