bos@564: <screen><prompt>$</prompt> <userinput>hg update</userinput>
hg@306: abort: crosses branches (use 'hg merge' or 'hg update -C')
bos@564: </screen>