diff hgmerge @ 4417:0912d8df5e19

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 08 May 2007 11:42:48 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff