equal
deleted
inserted
replaced
2 |
2 |
3 Object subclass:#MCVersionMerger |
3 Object subclass:#MCVersionMerger |
4 instanceVariableNames:'records merger' |
4 instanceVariableNames:'records merger' |
5 classVariableNames:'' |
5 classVariableNames:'' |
6 poolDictionaries:'' |
6 poolDictionaries:'' |
7 category:'Monticello-Versioning' |
7 category:'SCM-Monticello-Versioning' |
8 ! |
8 ! |
9 |
9 |
10 |
10 |
11 !MCVersionMerger class methodsFor:'as yet unclassified'! |
11 !MCVersionMerger class methodsFor:'as yet unclassified'! |
12 |
12 |
59 ! ! |
59 ! ! |
60 |
60 |
61 !MCVersionMerger class methodsFor:'documentation'! |
61 !MCVersionMerger class methodsFor:'documentation'! |
62 |
62 |
63 version |
63 version |
64 ^ '$Header: /cvs/stx/stx/goodies/monticello/MCVersionMerger.st,v 1.1 2006-11-22 13:16:23 cg Exp $' |
64 ^ '$Header: /cvs/stx/stx/goodies/monticello/MCVersionMerger.st,v 1.2 2012-09-11 21:30:49 cg Exp $' |
65 ! ! |
65 ! ! |