diff tests/test-merge7.out @ 3128: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 2ef0b3aae186
children 3fd098e0902d
line wrap: on
line diff