$ hg update abort: crosses branches (use 'hg merge' or 'hg update -C')