--- a/Tools__ChangeSetDiffTool.st	Mon Apr 02 13:11:56 2012 +0100
+++ b/Tools__ChangeSetDiffTool.st	Tue Apr 03 13:32:03 2012 +0100
@@ -1570,6 +1570,7 @@
 
     | info |
     info := self diffInfo.
+    info isNil ifTrue:[^false].
     ^info isMerge and:[info specMerge isFile and:[info diffset isMerged]]
 
     "Created: / 20-03-2012 / 15:00:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1580,6 +1581,7 @@
 
     | info |
     info := self diffInfo.
+    info isNil ifTrue:[^false].
     ^info isMerge and:[info diffset isMerged]
 
     "Created: / 20-03-2012 / 15:03:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -2451,5 +2453,5 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetDiffTool.st 7948 2012-03-21 01:52:35Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetDiffTool.st 7963 2012-04-03 12:32:03Z vranyj1 $'
 ! !