bos@144: $ \textbf{hg update} hg@306: abort: crosses branches (use 'hg merge' or 'hg update -C')