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
touch a
hg add a
hg ci -t "a" -u test -d "0 0"
echo 123 > b
hg add b
hg diff | sed "s/\(\(---\|+++\).*\)\t.*/\1/"
hg diff -r tip | sed "s/\(\(---\|+++\).*\)\t.*/\1/"