--- a/ChangeSetDiffComponent.st	Wed Nov 13 18:33:43 2013 +0000
+++ b/ChangeSetDiffComponent.st	Thu Nov 14 14:47:40 2013 +0000
@@ -65,14 +65,12 @@
 "
 ! !
 
-
 !ChangeSetDiffComponent class methodsFor:'others'!
 
 version_CVS
     ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffComponent.st,v 1.4 2012-07-31 12:34:40 vrany Exp $'
 ! !
 
-
 !ChangeSetDiffComponent methodsFor:'accessing'!
 
 changesetA
@@ -81,13 +79,13 @@
 
     cs := ChangeSet new name: self versionALabel.
     self do:[:item|
-        (item versionA notNil and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]) ifTrue:[
+        (item versionA" notNil and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]") ifTrue:[
             cs add: item versionA
         ]
     ].
     ^cs
 
-    "Modified: / 29-01-2013 / 18:44:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13-11-2013 / 11:46:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 changesetB
@@ -96,13 +94,13 @@
 
     cs := ChangeSet new name: self versionBLabel.
     self do:[:item|
-        (item versionB notNil and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]) ifTrue:[
+        (item versionB" notNil and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]") ifTrue:[
             cs add: item versionB
         ]
     ].
     ^cs
 
-    "Modified: / 29-01-2013 / 18:44:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13-11-2013 / 11:46:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 changesetBase
@@ -111,14 +109,14 @@
 
     cs := ChangeSet new name: self versionBaseLabel.
     self do:[:item|
-        (item versionBase notNil and:[item versionBase isClassDefinitionChange or:[item versionBase isMethodCodeChange]]) ifTrue:[
+        (item versionBase notNil" and:[item versionBase isClassDefinitionChange or:[item versionBase isMethodCodeChange]]") ifTrue:[
             cs add: item versionBase
         ]
     ].
     ^cs
 
     "Created: / 20-03-2012 / 13:31:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 29-01-2013 / 18:44:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13-11-2013 / 11:47:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 changesetMerged
@@ -127,13 +125,14 @@
 
     cs := ChangeSet new name: 'Merged'.
     self do:[:item|
-"/        (item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]) ifTrue:[
+        (item versionMerged notNil "and:[item versionMerged isClassDefinitionChange or:[item versionMerged isMethodCodeChange]]") ifTrue:[
             cs add: item versionMerged
-"/        ]
+        ]
     ].
     ^cs
 
     "Created: / 20-03-2012 / 13:32:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13-11-2013 / 11:47:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 depth
@@ -189,7 +188,6 @@
     "Created: / 20-03-2012 / 13:31:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetDiffComponent methodsFor:'change & update'!
 
 changed: aspect with: param
@@ -201,7 +199,6 @@
     "Created: / 24-11-2009 / 12:58:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetDiffComponent methodsFor:'enumerating'!
 
 do: aBlock
@@ -211,7 +208,6 @@
     "Created: / 25-11-2009 / 10:22:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetDiffComponent methodsFor:'printing & storing'!
 
 printOn:aStream
@@ -225,7 +221,6 @@
     "Modified: / 26-11-2009 / 16:25:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetDiffComponent methodsFor:'private'!
 
 flattenOn: stream
@@ -247,7 +242,6 @@
     "Created: / 17-01-2013 / 13:57:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ChangeSetDiffComponent methodsFor:'testing'!
 
 isConflict
@@ -291,7 +285,6 @@
     ^ self subclassResponsibility
 ! !
 
-
 !ChangeSetDiffComponent class methodsFor:'documentation'!
 
 version