diff tests/test-merge6 @ 3281:f49c90b46897

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