tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Sun, 17 Dec 2006 14:56:12 -0600
changeset 3921 6d0d025e125a
parent 2175 b2ae81a7df29
permissions -rw-r--r--
demandimport: fix import x.y.z as a when x.y is already imported.

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)