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 "[hooks]" > .hg/hgrc
echo 'precommit = echo precommit hook' >> .hg/hgrc
echo 'commit = echo commit hook: $NODE' >> .hg/hgrc
echo a > a
hg add a
hg commit -t "test" -u test -d "0 0"