diff tests/test-conflict.out @ 3921:6d0d025e125a

demandimport: fix import x.y.z as a when x.y is already imported.
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Dec 2006 14:56:12 -0600
parents b2ae81a7df29
children 46280c004f22
line wrap: on
line diff