--- a/Tools__ChangeSetDiffList.st	Mon Jan 14 12:06:46 2013 +0000
+++ b/Tools__ChangeSetDiffList.st	Tue Jan 15 12:03:21 2013 +0000
@@ -482,17 +482,18 @@
     | label icon oldPaint |
     label := self label.
 "/    ((application topApplication askFor:#isMerge) and:[model isMerged not]) ifTrue:[
-    (application highlightConflictsHolder value and:[model isConflict]) ifTrue:[
+    (application highlightConflictsHolder value and:[model "isConflict"isMerged not]) ifTrue:[
         oldPaint := aGC paint.
         aGC paint: TextDiff3Tool colorConflict.
         '!!' displayOn: aGC x: x  y:y opaque: opaque.
         aGC paint: oldPaint.
         label := label asText allBold"/; colorizeAllWith: Color red darker.
     ].
-    (icon := self icon) ifNotNil:[icon displayOn: aGC x: x + 10 y: y - icon height opaque: opaque].
+    (icon := self icon) notNil ifTrue:[icon displayOn: aGC x: x + 10 y: y - icon height opaque: opaque].
     label displayOn: aGC x: x + 10 + 16 y:y opaque: opaque
 
     "Created: / 24-11-2009 / 18:21:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-01-2013 / 11:35:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !ChangeSetDiffList class methodsFor:'documentation'!
@@ -502,5 +503,5 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetDiffList.st 8035 2012-08-03 13:47:21Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetDiffList.st 8086 2013-01-15 12:03:21Z vranyj1 $'
 ! !