--- a/Tools__TextDiff3Tool.st Wed Mar 21 01:52:35 2012 +0000
+++ b/Tools__TextDiff3Tool.st Wed Mar 21 12:48:24 2012 +0000
@@ -416,21 +416,21 @@
doMergeUsingA
- self mergeData mergeUsingA
+ self mergeData mergeUsingA: self textA
"Created: / 17-03-2012 / 12:55:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
doMergeUsingB
- self mergeData mergeUsingB
+ self mergeData mergeUsingB: self textB
"Created: / 17-03-2012 / 12:55:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
doMergeUsingBase
- self mergeData mergeUsingBase
+ self mergeData mergeUsingBase: self textC
"Created: / 17-03-2012 / 12:55:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
@@ -802,7 +802,7 @@
info isNil ifTrue:[ ^self ].
view fillRectangleX:x y:y - h
- width:6 height:h + textView lineSpacing + 3"Magic constant to make it look nicer"
+ width:6 height:h + textView lineSpacing + 5"Magic constant to make it look nicer"
color: info color.
"Created: / 19-03-2012 / 13:15:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -837,5 +837,5 @@
!TextDiff3Tool class methodsFor:'documentation'!
version_SVN
- ^ '$Id: Tools__TextDiff3Tool.st 7948 2012-03-21 01:52:35Z vranyj1 $'
+ ^ '$Id: Tools__TextDiff3Tool.st 7950 2012-03-21 12:48:24Z vranyj1 $'
! !