diff tests/test-merge5 @ 3441:ef2e990f9047

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