Tidy up conflict and pull tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tidy up conflict and pull tests Fix failure to kill hg serve process and pipeline ordering with set -e manifest hash: eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg pI3IH2BvqUlckdLwx3M5jcQ= =s/QA -----END PGP SIGNATURE-----

#!/usr/bin/env python
#
# An example CGI script to use hgweb, edit as necessary

import cgitb, os, sys
cgitb.enable()

# sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install
from mercurial import hgweb

h = hgweb.hgweb("/path/to/repo", "repository name")
h.run()