diff mercurial/__init__.py @ 6437:101526031d06

hgweb: fix merge breakage
author Matt Mackall <mpm@selenic.com>
date Mon, 31 Mar 2008 23:14:25 -0500
parents 9117c6561b0b
children 4374d819ccd5
line wrap: on
line diff