Mercurial > hg > pyhgsh

view tests/test-merge1.out @ 941:4cf418c2a013

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a multi-repository server This merges a bunch of the ideas for a multi-repository CGI script and simplifies things a bit. It uses PATH_INFO so it generally wants paths of the form: http://host/hg.cgi/virtualpath This gets mapped via a simple config file to the real path. All info about the repo is read from the repo's hgrc.
author mpm@selenic.com
date Fri, 19 Aug 2005 16:38:25 -0800
parents 5a034646e472
children 67a28636ea64
line wrap: on
line source

merging for b
merging b
This is file b1
merging for b
merging b
merging for b
merging b