Minor merge fixups
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa
mkdir a
cd a
hg init
echo 123 > a
hg add a
hg commit -t "a" -u a -d "0 0"
cd ..
mkdir b
cd b
hg init
echo 321 > b
hg add b
hg commit -t "b" -u b -d "0 0"
hg pull ../a
hg heads