--- 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|