diff tests/test-merge1.out @ 3281:f49c90b46897

Update test output
author Matt Mackall <mpm@selenic.com>
date Fri, 06 Oct 2006 17:14:50 -0500
parents a31557193f3c
children 966632304dde 49966b5ab16f
line wrap: on
line diff