equal
deleted
inserted
replaced
405 ! ! |
405 ! ! |
406 |
406 |
407 !TextDiff3Tool methodsFor:'actions'! |
407 !TextDiff3Tool methodsFor:'actions'! |
408 |
408 |
409 doMergeAuto |
409 doMergeAuto |
410 self halt. |
410 |
|
411 self mergeDataHolder value |
|
412 text1: self textC text2: self textA text3: self textB. |
411 |
413 |
412 "Created: / 17-03-2012 / 12:55:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414 "Created: / 17-03-2012 / 12:55:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
413 ! |
415 ! |
414 |
416 |
415 doMergeUsingA |
417 doMergeUsingA |
804 color: info color. |
806 color: info color. |
805 |
807 |
806 "Created: / 19-03-2012 / 13:15:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
808 "Created: / 19-03-2012 / 13:15:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807 ! ! |
809 ! ! |
808 |
810 |
|
811 !TextDiff3Tool::MergeService methodsFor:'event handling'! |
|
812 |
|
813 linesModifiedFrom: start to: end |
|
814 |
|
815 start to: end do:[:i| |
|
816 (data listInfos at:i) resolution: #Merged. |
|
817 ]. |
|
818 gutterView invalidate. |
|
819 |
|
820 "Created: / 06-07-2011 / 17:14:36 / jv" |
|
821 "Created: / 20-03-2012 / 22:57:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
822 ! ! |
|
823 |
809 !TextDiff3Tool::MergeService methodsFor:'registering'! |
824 !TextDiff3Tool::MergeService methodsFor:'registering'! |
810 |
825 |
811 registerIn: aCodeView |
826 registerIn: aCodeView |
812 |
827 |
813 "Installs myself in aCodeView" |
828 "Installs myself in aCodeView" |
820 ! ! |
835 ! ! |
821 |
836 |
822 !TextDiff3Tool class methodsFor:'documentation'! |
837 !TextDiff3Tool class methodsFor:'documentation'! |
823 |
838 |
824 version_SVN |
839 version_SVN |
825 ^ '$Id: Tools__TextDiff3Tool.st 7947 2012-03-20 16:59:54Z vranyj1 $' |
840 ^ '$Id: Tools__TextDiff3Tool.st 7948 2012-03-21 01:52:35Z vranyj1 $' |
826 ! ! |
841 ! ! |