Mercurial > hg
view hgweb.cgi @ 232:fc4a6e5b5812
hg resolve: merge a given node into the working directory
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg resolve: merge a given node into the working directory
This is the first pass at working directory-based merges. Doing a
resolve adds a second parent to the working directory state for the
next commit.
manifest hash: 827b19995dd2d7686286da3b62c7d5fe3e0bc48c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMSHywK+sNU5EO8RAnOkAJsHH9jviMJcQJ4JurFuSlrbIwKqRACdHgNC
kkfoAxX2E5jkuOeSJ1Hjalk=
=bdrT
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 12:58:47 -0800 |
parents | e875a0cf7f3a |
children | 5f65a108a559 |
line wrap: on
line source
#!/usr/bin/env python # # An example CGI script to use hgweb, edit as necessary import cgitb, os, sys # 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()