diff hgmerge @ 3003:cbb90f4bafb0

merge: eliminate usage of m1 after working manifest creation
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 17:20:09 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff