diff tests/test-merge6.out @ 3000:33dcf03ef45f

merge: hoist partial code out of manifest loops
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 16:23:29 -0500
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff