Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/hgweb/__init__.py @ 4385:93a4e72b4f83
run-tests.py: pass -L/--label to simplemerge
This should give us conflict markers that don't change from one run
to another.
Remove some sed's/egrep's from some tests.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sat, 28 Apr 2007 17:55:45 -0300 |
| parents | abaee83ce0a6 |
| children |
line wrap: on
line source
# hgweb/__init__.py - web interface to a mercurial repository # # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> # Copyright 2005 Matt Mackall <mpm@selenic.com> # # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. import hgweb_mod, hgwebdir_mod def hgweb(*args, **kwargs): return hgweb_mod.hgweb(*args, **kwargs) def hgwebdir(*args, **kwargs): return hgwebdir_mod.hgwebdir(*args, **kwargs)