--- a/Tools__TextMergeInfo.st	Mon May 09 10:04:07 2016 +0200
+++ b/Tools__TextMergeInfo.st	Mon May 09 10:04:09 2016 +0200
@@ -47,14 +47,14 @@
 
 conflictLineText
 
-    ^ '<conflict>' asText allBold colorizeAllWith: Color red.
+    ^ '<conflict>' allBold withColor: Color red.
 
     "Created: / 03-04-2012 / 23:26:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 noSourceLineText
 
-    ^'<no source line>' asText colorizeAllWith: Color red.
+    ^'<no source line>' withColor: Color red.
 
     "Created: / 03-04-2012 / 23:26:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
@@ -458,10 +458,10 @@
 !TextMergeInfo class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextMergeInfo.st,v 1.1 2014-02-05 18:57:16 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TextMergeInfo.st,v 1.1 2014-02-05 18:57:16 cg Exp $'
+    ^ '$Header$'
 ! !