diff tests/test-merge2 @ 7865:e9d4ed761c49

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