Minor merge fixups
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa
#!/bin/sh -x
hg init
echo a > a
hg add a
hg commit -t "test" -u test -d "0 0"
hg history
hg tag -u test -d "0 0" "bleah"
hg history
echo foo >> .hgtags
hg tag -u test -d "0 0" "bleah2" || echo "failed"