Minor merge fixups
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa
#header## HG changeset patch# User #author## Date #date|date## Node ID #node##parent##desc##diff#