tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Thu, 30 Nov 2006 19:50:28 -0600
changeset 3735 205f0fd4a4a1
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Add missing test output

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