diff hgmerge @ 2848:e78cad1f6b1f

Merge manifest refactor work
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Aug 2006 15:03:46 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff