--- a/Tools__ChangeSetDiffTool.st	Tue Mar 20 16:59:54 2012 +0000
+++ b/Tools__ChangeSetDiffTool.st	Wed Mar 21 01:52:35 2012 +0000
@@ -714,6 +714,7 @@
                   label: 'Exit'
                   itemValue: closeRequest
                   translateLabel: true
+                  shortcutKey: Ctrlq
                 )
                )
               nil
@@ -1340,12 +1341,12 @@
     self diffInfo isNil ifTrue:[ ^ self ].
 
     self diffInfo isDiff3 ifTrue:[
-        textDiffToolHolder value isDiff3 ifFalse:[
+        self textDiffToolHolder value isDiff3 ifFalse:[
             textDiffToolHolder value: self textDiff3Tool.
         ].
         self mergeHolder value: self diffInfo isMerge.
     ] ifFalse:[
-        textDiffToolHolder value isDiff2 ifFalse:[
+        self textDiffToolHolder value isDiff2 ifFalse:[
             textDiffToolHolder value: self textDiff2Tool.
         ].
         self mergeHolder value: false.
@@ -2450,5 +2451,5 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetDiffTool.st 7947 2012-03-20 16:59:54Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetDiffTool.st 7948 2012-03-21 01:52:35Z vranyj1 $'
 ! !