diff tests/test-merge2 @ 3892:2eec996f2fb9

Fix demandload bits of setup.py py2exe support
author Matt Mackall <mpm@selenic.com>
date Thu, 14 Dec 2006 20:23:25 -0600
parents 7544700fd931
children 9dcf9d45cab8
line wrap: on
line diff