--- a/Tools__ChangeSetDiffTool.st	Fri Jan 18 00:33:28 2013 +0000
+++ b/Tools__ChangeSetDiffTool.st	Tue Jan 22 09:35:06 2013 +0000
@@ -1630,7 +1630,7 @@
             labelImage: (ResourceRetriever ToolbarIconLibrary mergePrev24x24)
           )
          (MenuItem
-            label: 'Go To Next Delta'
+            label: 'Go to Next Delta'
             itemValue: menuMoveDown
             isButton: true
             labelImage: (ResourceRetriever ToolbarIconLibrary mergeNext24x24)
@@ -1639,33 +1639,39 @@
             label: 'Go to Previous Conflict'
             itemValue: menuMoveUpConflict
             isButton: true
+            isVisible: mergeHolder
             labelImage: (ResourceRetriever ToolbarIconLibrary mergePrevConflict24x24)
           )
          (MenuItem
             label: 'Go to Next Conflict'
             itemValue: menuMoveDownConflict
             isButton: true
+            isVisible: mergeHolder
             labelImage: (ResourceRetriever ToolbarIconLibrary mergeNextConflict24x24)
           )
          (MenuItem
             label: '-'
+            isVisible: mergeHolder
           )
          (MenuItem
             label: 'Merge using Base'
             itemValue: listMenuMergeUsingBase
             isButton: true
+            isVisible: mergeHolder
             labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBaseAll24x24)
           )
          (MenuItem
             label: 'Merge using A'
             itemValue: listMenuMergeUsingA
             isButton: true
+            isVisible: mergeHolder
             labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingAAll24x24)
           )
          (MenuItem
             label: 'Merge using B'
             itemValue: listMenuMergeUsingB
             isButton: true
+            isVisible: mergeHolder
             labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBAll24x24)
           )
          )
@@ -2393,12 +2399,11 @@
         self infoPanel showProgressLabeled: (resources string:'Reading changesets') while: [
             info read.
             self diffset: info diffset.
-            self updateViews.
         ].
     ].
 
     "Created: / 19-03-2012 / 23:40:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 17-01-2013 / 21:01:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 21-01-2013 / 21:12:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 diffsetChanged
@@ -2426,10 +2431,11 @@
     self versionALabelHolder value: ds versionALabel.
     self versionBLabelHolder value: ds versionBLabel.
     self versionBaseLabelHolder value: ds versionBaseLabel.
+    self updateViews.
 
     "Created: / 05-12-2009 / 11:03:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 29-06-2011 / 08:24:18 / Jan Vrany <enter your email here>"
-    "Modified: / 17-01-2013 / 21:22:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 21-01-2013 / 21:13:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 mergeDataChanged
@@ -2546,9 +2552,7 @@
 
 updateViews
 
-    self diffInfo isNil ifTrue:[ ^ self ].
-
-    self diffInfo isDiff3 ifTrue:[
+    (self diffInfo notNil and:[self diffInfo isDiff3]) ifTrue:[
         self diffInfo isMerge ifTrue:[
             self mergeHolder value: true.
             self labelSpecHolder value: #labelMergeSpec.
@@ -2574,7 +2578,15 @@
     ].
 
     "Created: / 20-03-2012 / 10:21:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 17-01-2013 / 23:38:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 21-01-2013 / 21:16:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!ChangeSetDiffTool methodsFor:'hooks'!
+
+commonPostOpen
+    self updateViews
+
+    "Created: / 21-01-2013 / 21:18:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !ChangeSetDiffTool methodsFor:'initialization'!
@@ -2858,10 +2870,13 @@
 !ChangeSetDiffTool methodsFor:'private'!
 
 labelHeight: height
-    labelsView layout: (labelsView layout copy bottomOffset: height).
-    navigatorAndDiffPanelView layout: (navigatorAndDiffPanelView layout copy topOffset: height).
+    (labelsView notNil and:[navigatorAndDiffPanelView notNil]) ifTrue:[
+        labelsView layout: (labelsView layout copy bottomOffset: height).
+        navigatorAndDiffPanelView layout: (navigatorAndDiffPanelView layout copy topOffset: height).
+    ].
 
     "Created: / 17-01-2013 / 23:38:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 21-01-2013 / 21:17:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !ChangeSetDiffTool methodsFor:'queries'!
@@ -3853,6 +3868,12 @@
     ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: Tools__ChangeSetDiffTool.st 8092 2013-01-18 00:33:28Z vranyj1 $'
+    ^ '§Id: Tools__ChangeSetDiffTool.st 8092 2013-01-18 00:33:28Z vranyj1 §'
 ! !
+