equal
deleted
inserted
replaced
2 |
2 |
3 MCPatchBrowser subclass:#MCMergeBrowser |
3 MCPatchBrowser subclass:#MCMergeBrowser |
4 instanceVariableNames:'conflicts merger ok' |
4 instanceVariableNames:'conflicts merger ok' |
5 classVariableNames:'' |
5 classVariableNames:'' |
6 poolDictionaries:'' |
6 poolDictionaries:'' |
7 category:'Monticello-UI' |
7 category:'SCM-Monticello-UI' |
8 ! |
8 ! |
9 |
9 |
10 |
10 |
11 !MCMergeBrowser class methodsFor:'as yet unclassified'! |
11 !MCMergeBrowser class methodsFor:'as yet unclassified'! |
12 |
12 |
149 ! ! |
149 ! ! |
150 |
150 |
151 !MCMergeBrowser class methodsFor:'documentation'! |
151 !MCMergeBrowser class methodsFor:'documentation'! |
152 |
152 |
153 version |
153 version |
154 ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMergeBrowser.st,v 1.1 2006-11-22 13:24:43 cg Exp $' |
154 ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMergeBrowser.st,v 1.2 2012-09-11 21:12:50 cg Exp $' |
155 ! ! |
155 ! ! |