diff hgmerge @ 3133:15fde1970003

qimport: rename patch to patchname to avoid shadowing module
author Brendan Cully <brendan@kublai.com>
date Tue, 19 Sep 2006 08:45:39 -0700
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff