diff mercurial/merge.py @ 3209:9e8dd6114a4e

merged brendan's hgweb cleanups
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 30 Sep 2006 12:34:31 +0200
parents 9e002614f2eb
children 3fd098e0902d
line wrap: on
line diff