comparison tests/test-conflict.out @ 7865:e9d4ed761c49

Fix new CVS test output
author Matt Mackall <mpm@selenic.com>
date Fri, 20 Mar 2009 18:49:44 -0500
parents 9fe7e6acf525
children b2310903c462
comparison
equal deleted inserted replaced
7864:c4a73d54126a 7865:e9d4ed761c49