|
76
|
1 |
"{ Package: 'stx:goodies/monticello' }"
|
|
|
2 |
|
|
|
3 |
Notification subclass:#MCMergeResolutionRequest
|
|
|
4 |
instanceVariableNames:'merger'
|
|
|
5 |
classVariableNames:''
|
|
|
6 |
poolDictionaries:''
|
|
583
|
7 |
category:'SCM-Monticello-Versioning'
|
|
76
|
8 |
!
|
|
|
9 |
|
|
|
10 |
|
|
|
11 |
!MCMergeResolutionRequest methodsFor:'as yet unclassified'!
|
|
|
12 |
|
|
|
13 |
defaultAction
|
|
|
14 |
^ (MCMergeBrowser new
|
|
|
15 |
merger: merger;
|
|
|
16 |
label: messageText) showModally
|
|
|
17 |
!
|
|
|
18 |
|
|
|
19 |
merger
|
|
|
20 |
^ merger
|
|
|
21 |
!
|
|
|
22 |
|
|
|
23 |
merger: aMerger
|
|
|
24 |
merger _ aMerger
|
|
|
25 |
! !
|
|
|
26 |
|
|
|
27 |
!MCMergeResolutionRequest class methodsFor:'documentation'!
|
|
|
28 |
|
|
|
29 |
version
|
|
583
|
30 |
^ '$Header: /cvs/stx/stx/goodies/monticello/MCMergeResolutionRequest.st,v 1.2 2012-09-11 21:12:59 cg Exp $'
|
|
76
|
31 |
! !
|