diff hgmerge @ 2850:b11c014dcbd9

Merge: use single objects for tracking manifests
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Aug 2006 22:07:13 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff