equal
deleted
inserted
replaced
56 |
56 |
57 [author:] |
57 [author:] |
58 Claus Gittinger |
58 Claus Gittinger |
59 " |
59 " |
60 ! ! |
60 ! ! |
|
61 |
61 |
62 |
62 !Diff3TextView class methodsFor:'instance creation'! |
63 !Diff3TextView class methodsFor:'instance creation'! |
63 |
64 |
64 openOnMergedText:text label:firstLabel label:secondLabel label:thirdLabel |
65 openOnMergedText:text label:firstLabel label:secondLabel label:thirdLabel |
65 "open up a view showing firstText, secondText and thirdText side-by-side, |
66 "open up a view showing firstText, secondText and thirdText side-by-side, |
96 label:'private.rc' |
97 label:'private.rc' |
97 " |
98 " |
98 |
99 |
99 "Modified: 12.12.1995 / 13:09:13 / cg" |
100 "Modified: 12.12.1995 / 13:09:13 / cg" |
100 ! ! |
101 ! ! |
|
102 |
101 |
103 |
102 !Diff3TextView class methodsFor:'public helpers'! |
104 !Diff3TextView class methodsFor:'public helpers'! |
103 |
105 |
104 emphasizeMergedDiff3Text:mergedText emphasize1:e1 emphasize2:e2 emphasizeSep:e3 |
106 emphasizeMergedDiff3Text:mergedText emphasize1:e1 emphasize2:e2 emphasizeSep:e3 |
105 "given the merge()/rcsmerge() merged output (as created by 'cvs update'), |
107 "given the merge()/rcsmerge() merged output (as created by 'cvs update'), |
279 ^ list |
281 ^ list |
280 |
282 |
281 "Created: / 01-06-2012 / 10:44:31 / cg" |
283 "Created: / 01-06-2012 / 10:44:31 / cg" |
282 ! ! |
284 ! ! |
283 |
285 |
|
286 |
284 !Diff3TextView methodsFor:'initialization'! |
287 !Diff3TextView methodsFor:'initialization'! |
285 |
288 |
286 initStyle |
289 initStyle |
287 super initStyle. |
290 super initStyle. |
288 |
291 |
306 ]. |
309 ]. |
307 |
310 |
308 "Created: 16.11.1995 / 16:59:48 / cg" |
311 "Created: 16.11.1995 / 16:59:48 / cg" |
309 "Modified: 12.12.1995 / 12:25:55 / cg" |
312 "Modified: 12.12.1995 / 12:25:55 / cg" |
310 ! ! |
313 ! ! |
|
314 |
311 |
315 |
312 !Diff3TextView methodsFor:'private'! |
316 !Diff3TextView methodsFor:'private'! |
313 |
317 |
314 updateListsFromMergedText:mergedText |
318 updateListsFromMergedText:mergedText |
315 "given the merge()/rcsmerge() merged output (as created by 'cvs update'), |
319 "given the merge()/rcsmerge() merged output (as created by 'cvs update'), |
432 textView3 list:l3. |
436 textView3 list:l3. |
433 |
437 |
434 "Modified: 13.12.1995 / 19:56:32 / cg" |
438 "Modified: 13.12.1995 / 19:56:32 / cg" |
435 ! ! |
439 ! ! |
436 |
440 |
|
441 |
437 !Diff3TextView class methodsFor:'documentation'! |
442 !Diff3TextView class methodsFor:'documentation'! |
438 |
443 |
439 version |
444 version |
440 ^ '$Id: Diff3TextView.st 8016 2012-07-18 09:57:46Z vranyj1 $' |
445 ^ '$Header: /cvs/stx/stx/libtool/Diff3TextView.st,v 1.9 2012-06-01 10:44:15 cg Exp $' |
441 ! |
446 ! |
442 |
447 |
443 version_SVN |
448 version_SVN |
444 ^ '$Id: Diff3TextView.st 8016 2012-07-18 09:57:46Z vranyj1 $' |
449 ^ '$Id: Diff3TextView.st 8016 2012-07-18 09:57:46Z vranyj1 $' |
445 ! ! |
450 ! ! |
|
451 |