diff hgmerge @ 3427:f2de6b6bc57a

imported patch b1
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 18:01:14 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff