diff hgmerge @ 3903:f9136599700f

Make demandimport pass all tests on python2.5.
author Brendan Cully <brendan@kublai.com>
date Fri, 15 Dec 2006 20:16:20 -0800
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff