comparison mercurial/localrepo.py @ 6437:101526031d06

hgweb: fix merge breakage
author Matt Mackall <mpm@selenic.com>
date Mon, 31 Mar 2008 23:14:25 -0500
parents 12377957948d
children cfeeac24fc1e 93e140dbcd44
comparison
equal deleted inserted replaced
6436:856ae126f48c 6437:101526031d06