mcconnell 2003/12/04 22:31:56
Log:
no message
Status:
Vendor Tag: MCCONNELL
Release Tags: INITIAL_20031205
C avalon-sandbox/kernel/unit/.cvsignore
C avalon-sandbox/kernel/unit/maven.xml
N avalon-sandbox/kernel/unit/merlin.properties
C avalon-sandbox/kernel/unit/project.xml
N avalon-sandbox/kernel/unit/conf/hello.block
N avalon-sandbox/kernel/unit/conf/override.xml
N avalon-sandbox/kernel/unit/conf/test-2.block
N avalon-sandbox/kernel/unit/conf/test.block
C
avalon-sandbox/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java
N
avalon-sandbox/kernel/unit/src/test/org/apache/avalon/merlin/unit/test/MerlinTestCaseTest.java
4 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jMCCONNELL:yesterday -jMCCONNELL avalon-sandbox/kernel/unit
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]