bos@611: <!-- BEGIN backout.manual.merge -->
bos@564: <screen><prompt>$</prompt> <userinput>hg merge</userinput>
bos@144: merging myfile
bos@144: 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
bos@144: (branch merge, don't forget to commit)
bos@564: <prompt>$</prompt> <userinput>hg commit -m 'merged backout with previous tip'</userinput>
bos@564: <prompt>$</prompt> <userinput>cat myfile</userinput>
bos@179: first change
bos@144: third change
bos@564: </screen>
bos@611: <!-- END backout.manual.merge -->