diff tests/test-excessive-merge.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 b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff