tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Fri, 11 Aug 2006 10:57:42 -0500
changeset 2852 046a8b03ea59
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Change remaining users of manifest flags

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)