MCMergeResolutionRequest.st
author Claus Gittinger <cg@exept.de>
Wed, 25 Feb 2015 01:14:48 +0100
changeset 975 9d3047664305
parent 583 6d9d9e1c78ab
child 1167 37c202ea81a8
permissions -rw-r--r--
class: ProjectDefinition changed: #monticelloName

"{ Package: 'stx:goodies/monticello' }"

Notification subclass:#MCMergeResolutionRequest
	instanceVariableNames:'merger'
	classVariableNames:''
	poolDictionaries:''
	category:'SCM-Monticello-Versioning'
!


!MCMergeResolutionRequest methodsFor:'as yet unclassified'!

defaultAction
	^ (MCMergeBrowser new
		merger: merger;
		label: messageText) showModally
!

merger
	^ merger
!

merger: aMerger
	merger _ aMerger
! !

!MCMergeResolutionRequest class methodsFor:'documentation'!

version
    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMergeResolutionRequest.st,v 1.2 2012-09-11 21:12:59 cg Exp $'
! !