tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Thu, 05 Jul 2007 16:17:01 -0500
changeset 4822 f48290864625
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)