--- a/Diff3.st Fri Oct 14 01:23:33 2016 +0200
+++ b/Diff3.st Fri Oct 14 01:23:39 2016 +0200
@@ -29,6 +29,8 @@
"
"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
+
Object subclass:#Diff3
instanceVariableNames:'file1 file0 file2 diffClass'
classVariableNames:''
@@ -102,7 +104,8 @@
documentation
"
- 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.
+ 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.
Instance Variables
diffClass: <Class> Should be a subclass of GenericDiff. Used to resolve changes.
@@ -834,10 +837,10 @@
!Diff3 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Diff3.st,v 1.3 2014-02-25 07:00:13 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Diff3.st,v 1.3 2014-02-25 07:00:13 cg Exp $'
+ ^ '$Header$'
! !