equal
deleted
inserted
replaced
26 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
26 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
27 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
27 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
28 OTHER DEALINGS IN THE SOFTWARE. |
28 OTHER DEALINGS IN THE SOFTWARE. |
29 " |
29 " |
30 "{ Package: 'stx:libtool' }" |
30 "{ Package: 'stx:libtool' }" |
|
31 |
|
32 "{ NameSpace: Smalltalk }" |
31 |
33 |
32 Object subclass:#Diff3 |
34 Object subclass:#Diff3 |
33 instanceVariableNames:'file1 file0 file2 diffClass' |
35 instanceVariableNames:'file1 file0 file2 diffClass' |
34 classVariableNames:'' |
36 classVariableNames:'' |
35 poolDictionaries:'' |
37 poolDictionaries:'' |
100 " |
102 " |
101 ! |
103 ! |
102 |
104 |
103 documentation |
105 documentation |
104 " |
106 " |
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. |
107 Diff3 provides a three-way-merge algorithm suitable for performing textual merges, |
|
108 such as are often required as part of source-code version control systems. |
106 |
109 |
107 Instance Variables |
110 Instance Variables |
108 diffClass: <Class> Should be a subclass of GenericDiff. Used to resolve changes. |
111 diffClass: <Class> Should be a subclass of GenericDiff. Used to resolve changes. |
109 file0: <SequenceableCollection> The ancestral file. |
112 file0: <SequenceableCollection> The ancestral file. |
110 file1: <SequenceableCollection> The left branch. |
113 file1: <SequenceableCollection> The left branch. |
832 ! ! |
835 ! ! |
833 |
836 |
834 !Diff3 class methodsFor:'documentation'! |
837 !Diff3 class methodsFor:'documentation'! |
835 |
838 |
836 version |
839 version |
837 ^ '$Header: /cvs/stx/stx/libtool/Diff3.st,v 1.3 2014-02-25 07:00:13 cg Exp $' |
840 ^ '$Header$' |
838 ! |
841 ! |
839 |
842 |
840 version_CVS |
843 version_CVS |
841 ^ '$Header: /cvs/stx/stx/libtool/Diff3.st,v 1.3 2014-02-25 07:00:13 cg Exp $' |
844 ^ '$Header$' |
842 ! ! |
845 ! ! |
843 |
846 |