tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Wed, 06 Dec 2006 13:13:26 -0600
changeset 3808 92a3532a01d9
parent 2175 b2ae81a7df29
permissions -rw-r--r--
parsedate: use Abort rather than ValueError

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)