diff tests/test-merge-local.out @ 7865:e9d4ed761c49

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