--- a/Diff3TextView.st Thu Apr 04 01:43:18 2013 +0100
+++ b/Diff3TextView.st Thu Apr 04 19:06:16 2013 +0100
@@ -59,7 +59,6 @@
"
! !
-
!Diff3TextView class methodsFor:'instance creation'!
openOnMergedText:text label:firstLabel label:secondLabel label:thirdLabel
@@ -100,7 +99,6 @@
"Modified: 12.12.1995 / 13:09:13 / cg"
! !
-
!Diff3TextView class methodsFor:'public helpers'!
emphasizeMergedDiff3Text:mergedText emphasize1:e1 emphasize2:e2 emphasizeSep:e3
@@ -283,7 +281,6 @@
"Created: / 01-06-2012 / 10:44:31 / cg"
! !
-
!Diff3TextView methodsFor:'initialization'!
initStyle
@@ -312,7 +309,6 @@
"Modified: 12.12.1995 / 12:25:55 / cg"
! !
-
!Diff3TextView methodsFor:'private'!
updateListsFromMergedText:mergedText
@@ -438,13 +434,17 @@
"Modified: 13.12.1995 / 19:56:32 / cg"
! !
-
!Diff3TextView class methodsFor:'documentation'!
version
^ '$Header: /cvs/stx/stx/libtool/Diff3TextView.st,v 1.9 2012-06-01 10:44:15 cg Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id: Diff3TextView.st 8016 2012-07-18 09:57:46Z vranyj1 $'
! !