--- a/ChangeSetDiffSet.st	Tue Nov 29 11:23:10 2011 +0100
+++ b/ChangeSetDiffSet.st	Tue Nov 29 11:25:37 2011 +0100
@@ -109,22 +109,25 @@
 !
 
 resolution
+    | changeset |
 
-    | changeset |
     changeset := ChangeSet new.
-    self do:
-        [:diff|
-        diff versionMerged ifNotNil:
-            [changeset add: diff versionMerged]].
+    self do:[:diff|
+        diff versionMerged notNil ifTrue:[
+            changeset add: diff versionMerged
+        ]
+    ].
     ^changeset
 
     "Created: / 26-11-2009 / 08:44:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 29-11-2011 / 11:25:02 / cg"
 !
 
 versionALabel
-    ^ versionALabel ifNil:[parent ifNotNil:[parent versionALabel]]
+    ^ versionALabel isNil ifTrue:[parent ifNotNil:[parent versionALabel]]
 
     "Modified: / 21-11-2009 / 07:50:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 29-11-2011 / 11:25:09 / cg"
 !
 
 versionALabel:aString
@@ -132,9 +135,10 @@
 !
 
 versionBLabel
-    ^ versionBLabel ifNil:[parent ifNotNil:[parent versionBLabel]]
+    ^ versionBLabel isNil ifTrue:[parent ifNotNil:[parent versionBLabel]]
 
     "Modified: / 21-11-2009 / 07:51:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 29-11-2011 / 11:25:16 / cg"
 !
 
 versionBLabel:aString
@@ -143,10 +147,11 @@
 
 versionBaseLabel
 
-    ^ versionBaseLabel ifNil:[parent ifNotNil:[parent versionBaseLabel]]
+    ^ versionBaseLabel isNil ifTrue:[parent ifNotNil:[parent versionBaseLabel]]
 
     "Created: / 23-11-2009 / 22:54:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 24-11-2009 / 09:21:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 29-11-2011 / 11:25:21 / cg"
 !
 
 versionBaseLabel:aString
@@ -237,5 +242,5 @@
 !ChangeSetDiffSet class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffSet.st,v 1.2 2011-07-07 13:22:59 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffSet.st,v 1.3 2011-11-29 10:25:37 cg Exp $'
 ! !