diff tests/test-up-local-change.out @ 2567:2748253b49c2

Merge context patches
author Matt Mackall <mpm@selenic.com>
date Wed, 05 Jul 2006 13:28:25 -0500
parents bb403d427974
children 30f59f4a327e 9d1c3529ebbc
line wrap: on
line diff