equal
deleted
inserted
replaced
31 |
31 |
32 Object subclass:#Diff3 |
32 Object subclass:#Diff3 |
33 instanceVariableNames:'file1 file0 file2 diffClass' |
33 instanceVariableNames:'file1 file0 file2 diffClass' |
34 classVariableNames:'' |
34 classVariableNames:'' |
35 poolDictionaries:'' |
35 poolDictionaries:'' |
36 category:'Collections-Sequenceable-Diff3' |
36 category:'Collections-Sequenceable-Diff' |
37 ! |
37 ! |
38 |
38 |
39 Object subclass:#Chunk |
39 Object subclass:#Chunk |
40 instanceVariableNames:'offset length side' |
40 instanceVariableNames:'offset length side' |
41 classVariableNames:'' |
41 classVariableNames:'' |
100 " |
100 " |
101 ! |
101 ! |
102 |
102 |
103 documentation |
103 documentation |
104 " |
104 " |
105 Diff3 provides a three-way-merge algorithm suitable for performing textual merges, such as are often required as part of source-code version control systems. |
105 Diff3 provides a three-way-merge algorithm suitable for performing textual merges, such as are often required as part of source-code version control systems. |
106 |
106 |
107 Instance Variables |
107 Instance Variables |
108 diffClass: <Class> Should be a subclass of GenericDiff. Used to resolve changes. |
108 diffClass: <Class> Should be a subclass of GenericDiff. Used to resolve changes. |
109 file0: <SequenceableCollection> The ancestral file. |
109 file0: <SequenceableCollection> The ancestral file. |
110 file1: <SequenceableCollection> The left branch. |
110 file1: <SequenceableCollection> The left branch. |
111 file2: <SequenceableCollection> The right branch. |
111 file2: <SequenceableCollection> The right branch. |
112 |
112 |
466 " |
466 " |
467 ! |
467 ! |
468 |
468 |
469 documentation |
469 documentation |
470 " |
470 " |
471 A Diff3Chunk is a subclass of DiffChunk that also knows which side of a three-way merge it represents. |
471 A Diff3Chunk is a subclass of DiffChunk that also knows which side of a three-way merge it represents. |
472 |
472 |
473 Instance Variables |
473 Instance Variables |
474 side: <Symbol> One of #left, #original or #right |
474 side: <Symbol> One of #left, #original or #right |
475 |
475 |
476 [author:] |
476 [author:] |
477 Tony Garnock-Jones <tonyg@lshift.com> |
477 Tony Garnock-Jones <tonyg@lshift.com> |
478 |
478 |
650 " |
650 " |
651 ! |
651 ! |
652 |
652 |
653 documentation |
653 documentation |
654 " |
654 " |
655 A Diff3Conflict represents a merge conflict. |
655 A Diff3Conflict represents a merge conflict. |
656 |
656 |
657 Instance Variables |
657 Instance Variables |
658 left: Either a SequenceableCollection or a Diff3Chunk representing the left variant. |
658 left: Either a SequenceableCollection or a Diff3Chunk representing the left variant. |
659 original: Either a SequenceableCollection or a Diff3Chunk representing the original variant. |
659 original: Either a SequenceableCollection or a Diff3Chunk representing the original variant. |
660 right: Either a SequenceableCollection or a Diff3Chunk representing the right variant. |
660 right: Either a SequenceableCollection or a Diff3Chunk representing the right variant. |
661 |
661 |
662 [author:] |
662 [author:] |
832 ! ! |
832 ! ! |
833 |
833 |
834 !Diff3 class methodsFor:'documentation'! |
834 !Diff3 class methodsFor:'documentation'! |
835 |
835 |
836 version |
836 version |
837 ^ '$Header: /cvs/stx/stx/libtool/Diff3.st,v 1.2 2014-02-05 19:13:18 cg Exp $' |
837 ^ '$Header: /cvs/stx/stx/libtool/Diff3.st,v 1.3 2014-02-25 07:00:13 cg Exp $' |
838 ! |
838 ! |
839 |
839 |
840 version_CVS |
840 version_CVS |
841 ^ '$Header: /cvs/stx/stx/libtool/Diff3.st,v 1.2 2014-02-05 19:13:18 cg Exp $' |
841 ^ '$Header: /cvs/stx/stx/libtool/Diff3.st,v 1.3 2014-02-25 07:00:13 cg Exp $' |
842 ! ! |
842 ! ! |
843 |
843 |