tests/test-merge4.out
author Brendan Cully <brendan@kublai.com>
Tue, 19 Sep 2006 08:45:39 -0700
changeset 3128 15fde1970003
parent 2175 b2ae81a7df29
permissions -rw-r--r--
qimport: rename patch to patchname to avoid shadowing module

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)