--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MCMergeResolutionRequest.st	Wed Nov 22 14:15:41 2006 +0100
@@ -0,0 +1,31 @@
+"{ Package: 'stx:goodies/monticello' }"
+
+Notification subclass:#MCMergeResolutionRequest
+	instanceVariableNames:'merger'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'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.1 2006-11-22 13:15:41 cg Exp $'
+! !