diff tests/test-merge-local @ 3897:f47afa2401a2

demandimport: ignore _hashlib and email.mime This makes things work with Python2.5. A better fix would be to fix demandload to use __getattribute__ to be more transparent.
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Dec 2006 12:38:18 -0600
parents ad6f34c83c3d
children 46280c004f22
line wrap: on
line diff