diff tests/test-merge1.out @ 3441:ef2e990f9047

imported patch foo
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 22:34:43 -0500
parents d2b55e3c4e25
children 3109f012c305
line wrap: on
line diff