tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Fri, 20 Mar 2009 18:49:44 -0500
changeset 7865 e9d4ed761c49
parent 6336 4b0c9c674707
permissions -rw-r--r--
Fix new CVS test output

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)