Minor merge fixups
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa
+ hg init
+ echo '[hooks]'
+ echo 'precommit = echo precommit hook'
+ echo 'commit = echo commit hook: $NODE'
+ echo a
+ hg add a
+ hg commit -t test -u test -d '0 0'
precommit hook
commit hook: acb14030fe0a21b60322c440ad2d20cf7685a376