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

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