Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/hgweb/__init__.py @ 4845:e4480f2b61e9
Check for conflict markers in hgmerge (issue471)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 08 Jul 2007 13:44:41 +0200 |
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)