Minor merge fixups
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa
include hg
recursive-include mercurial *.py
include hgweb.cgi
include hgeditor rewrite-log
include tests/README tests/run-tests tests/test-*[a-z] tests/*.out
include *.txt
include templates/map templates/map-*[a-z]
include templates/*.tmpl
include doc/README doc/*.txt
recursive-include contrib *
include README
include CONTRIBUTORS
include COPYING
include TODO
include MANIFEST.in