view tests/test-simplemerge-cmd.out @ 7865:e9d4ed761c49

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

(binary:application/octet-stream)