diff mercurial/ui.py @ 6437:101526031d06

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