--- a/Tools__TextDiffTool.st Mon Mar 19 10:03:58 2012 +0000
+++ b/Tools__TextDiffTool.st Mon Mar 19 15:32:45 2012 +0000
@@ -396,6 +396,13 @@
"Created: / 16-03-2012 / 13:05:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+textA
+
+ ^self textAHolder value
+
+ "Created: / 19-03-2012 / 12:24:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
textA: aString
^self textAHolder value: aString
@@ -403,6 +410,13 @@
"Created: / 30-08-2011 / 09:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+textB
+
+ ^self textBHolder value
+
+ "Created: / 19-03-2012 / 12:24:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
textB: aString
^self textBHolder value: aString
@@ -410,6 +424,13 @@
"Created: / 30-08-2011 / 09:43:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+textC
+
+ ^self textCHolder value
+
+ "Created: / 19-03-2012 / 12:24:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
textC: aString
^self textCHolder value: aString
@@ -772,10 +793,16 @@
^false
"Created: / 16-03-2012 / 15:21:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+isMerge
+ ^false
+
+ "Created: / 19-03-2012 / 11:53:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!TextDiffTool class methodsFor:'documentation'!
version_SVN
- ^ '$Id: Tools__TextDiffTool.st 7939 2012-03-17 13:13:35Z vranyj1 $'
+ ^ '$Id: Tools__TextDiffTool.st 7944 2012-03-19 15:32:45Z vranyj1 $'
! !