Minor merge fixups
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa
#!/bin/sh
mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -t "1"
hg verify
hg serve -p 20059 > /dev/null &
cd ..
hg clone http://localhost:20059/ copy
cd copy
hg verify
hg co
cat foo
hg manifest
hg pull
kill $!