diff tests/test-merge1.out @ 7865:e9d4ed761c49

Fix new CVS test output
author Matt Mackall <mpm@selenic.com>
date Fri, 20 Mar 2009 18:49:44 -0500
parents 4b0c9c674707
children 50b6af595e0c
line wrap: on
line diff