--- a/Diff3TextView.st Tue Jan 22 12:24:41 2013 +0000
+++ b/Diff3TextView.st Wed Jan 30 11:15:09 2013 +0000
@@ -59,6 +59,7 @@
"
! !
+
!Diff3TextView class methodsFor:'instance creation'!
openOnMergedText:text label:firstLabel label:secondLabel label:thirdLabel
@@ -99,6 +100,7 @@
"Modified: 12.12.1995 / 13:09:13 / cg"
! !
+
!Diff3TextView class methodsFor:'public helpers'!
emphasizeMergedDiff3Text:mergedText emphasize1:e1 emphasize2:e2 emphasizeSep:e3
@@ -281,6 +283,7 @@
"Created: / 01-06-2012 / 10:44:31 / cg"
! !
+
!Diff3TextView methodsFor:'initialization'!
initStyle
@@ -309,6 +312,7 @@
"Modified: 12.12.1995 / 12:25:55 / cg"
! !
+
!Diff3TextView methodsFor:'private'!
updateListsFromMergedText:mergedText
@@ -434,12 +438,14 @@
"Modified: 13.12.1995 / 19:56:32 / cg"
! !
+
!Diff3TextView class methodsFor:'documentation'!
version
- ^ '$Id: Diff3TextView.st 8016 2012-07-18 09:57:46Z vranyj1 $'
+ ^ '$Header: /cvs/stx/stx/libtool/Diff3TextView.st,v 1.9 2012-06-01 10:44:15 cg Exp $'
!
version_SVN
^ '$Id: Diff3TextView.st 8016 2012-07-18 09:57:46Z vranyj1 $'
! !
+