diff mercurial/dispatch.py @ 6437:101526031d06

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