--- a/test/MCMergingTest.st Wed May 29 01:59:55 2013 +0200
+++ b/test/MCMergingTest.st Wed May 29 02:00:02 2013 +0200
@@ -4,7 +4,7 @@
instanceVariableNames:'conflictBlock conflicts'
classVariableNames:''
poolDictionaries:''
- category:'Monticello-Tests'
+ category:'SCM-Monticello-Tests'
!
@@ -188,5 +188,6 @@
!MCMergingTest class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/goodies/monticello/test/MCMergingTest.st,v 1.1 2006-11-22 13:02:00 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/monticello/test/MCMergingTest.st,v 1.2 2013-05-29 00:00:02 vrany Exp $'
! !
+