Minor merge fixups
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa
#!/bin/sh
hg init
echo 123 > a
hg add a
hg commit -t "first" -u test -d "0 0" a
mkdir sub
echo 321 > sub/b
hg add sub/b
hg commit -t "second" -u test -d "0 0" sub/b
cat sub/b
hg co 0
cat sub/b
ls sub
true