Minor merge fixups
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash:
6787814cd75e9f9623c56dc36f865afd54f56bfa
Make manifest lookup use changeset ids
manifest hash:
83cf1ac9c68ad9e8de29d2c629c8a06eaeeeae15