tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Thu, 05 Apr 2007 17:09:31 -0500
changeset 4312 5e05007d3857
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Merge with stable

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)