hgmerge: use diff3 if available -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgmerge: use diff3 if available diff3 may be more readily available than merge manifest hash: 67a314ac42aa78410d64a6c3d36c2d575a588533 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoRUtywK+sNU5EO8RAmFPAJ0aN8VNvN9zpE/zov6wT3M98vGfDwCfXEOk xZlQHYIGrCLOFQiCQxIfr7I= =Asv9 -----END PGP SIGNATURE-----

     1

#!/usr/bin/env python

     2

#

     3

# An example CGI script to use hgweb, edit as necessary

     4

     5

import cgitb, os, sys

     6

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

     7

from mercurial import hgweb

     8

     9

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

    10

h.run()