Robin Berjon @robinberjon · 10 Jul 2012 $ hg merge abort: working dir not at a head rev - use "hg update" $ hg update abort: crosses branches (use 'hg merge' or 'hg update -C')
