diff tests/test-manifest-merging.out @ 3441:ef2e990f9047

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