(bin35) iron-horse$ hg up tip abort: outstanding merge conflicts (bin35) iron-horse$ hg merge --abort abort: no merge in progress