Minor merge fixups return a proper errorlevel on abort let force jump across branches catch exception on unlink manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa

#!/bin/sh

hg help
hg -q help
hg add -h
hg add --skjdfks
hg help diff
hg help foo
hg -q commands

exit 0