tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Thu, 14 Dec 2006 20:31:33 -0600
changeset 3894 d6cc510dfe5e
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Disable demandloading in setup.py

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)