diff hgmerge @ 2919:8743188f4d2e

merge: consolidate dirstate updates
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 23:17:06 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff