diff mercurial/httprepo.py @ 6437:101526031d06

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