diff mercurial/hg.py @ 6437:101526031d06

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