diff hgmerge @ 1234:9ee8428d84a1

Revert unrelated changes in previous commit
author mpm@selenic.com
date Tue, 13 Sep 2005 14:22:48 -0500
parents 9c918287d10b
children 696851b1bba9
line wrap: on
line diff