tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Thu, 06 Dec 2007 15:15:47 -0600
changeset 5606 447ea621e50e
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
copy: propagate errors properly

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b