view en/examples/results/daily.copy.merge.out @ 709:4432ad34b8e5

Check in example outputs with begin/end markers.

<!-- BEGIN daily.copy.merge -->
<screen><prompt>$</prompt> <userinput>hg pull ../my-copy</userinput>
pulling from ../my-copy
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
<prompt>$</prompt> <userinput>hg merge</userinput>
merging file and new-file to new-file
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
<prompt>$</prompt> <userinput>cat new-file</userinput>
line
new contents
</screen>
<!-- END daily.copy.merge -->