diff hgmerge @ 4209:dbc3846c09a1

Merge with -stable, fix small test failure
author Matt Mackall <mpm@selenic.com>
date Wed, 14 Mar 2007 01:26:09 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff