diff hgmerge @ 5046:bf444a9a9c23

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 01 Aug 2007 14:03:48 -0500
parents e4480f2b61e9
children f53d97d651f4
line wrap: on
line diff