diff -r f9f20407fbf9 -r c4cce8b7a95d Diff3.st
--- a/Diff3.st	Sun Oct 09 22:55:02 2016 +0100
+++ b/Diff3.st	Tue Oct 18 22:55:22 2016 +0100
@@ -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$'
 ! !