diff tests/test-merge3.out @ 3810:1d571ed26eed

Update tests
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Dec 2006 13:13:44 -0600
parents 91c56c427171
children
line wrap: on
line diff