# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 1567154788 -7200
# Node ID b11b1ecf5e32533214d99323d6f7e585cc7df8e2
# Parent  43371ae231174c42d6625ad2c9e9ca4fa80c0b15
#OTHER by exept
use allRed and allGray

diff -r 43371ae23117 -r b11b1ecf5e32 Tools__TextMergeInfo.st
--- a/Tools__TextMergeInfo.st	Fri Aug 30 10:45:17 2019 +0200
+++ b/Tools__TextMergeInfo.st	Fri Aug 30 10:46:28 2019 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -43,24 +45,15 @@
 "
 ! !
 
-!TextMergeInfo methodsFor:'* uncategorized *'!
+!TextMergeInfo methodsFor:'accessing'!
 
 conflictLineText
 
-    ^ '<conflict>' allBold withColor: Color red.
+    ^ '<conflict>' allBold allRed.
 
     "Created: / 03-04-2012 / 23:26:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-noSourceLineText
-
-    ^'<no source line>' withColor: Color red.
-
-    "Created: / 03-04-2012 / 23:26:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!TextMergeInfo methodsFor:'accessing'!
-
 list
     ^ list
 !
@@ -69,6 +62,13 @@
     ^ listInfos
 !
 
+noSourceLineText
+
+    ^'<no source line>' allRed.
+
+    "Created: / 03-04-2012 / 23:26:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 text
     ^String  streamContents:[:s|
         list withIndexDo:[:ln :i|