diff -r 64ce1418dcc8 -r 5fb4c6157f41 Diff3.st
--- a/Diff3.st	Mon Feb 24 19:36:31 2014 +0100
+++ b/Diff3.st	Tue Feb 25 08:00:13 2014 +0100
@@ -33,7 +33,7 @@
 	instanceVariableNames:'file1 file0 file2 diffClass'
 	classVariableNames:''
 	poolDictionaries:''
-	category:'Collections-Sequenceable-Diff3'
+	category:'Collections-Sequenceable-Diff'
 !
 
 Object subclass:#Chunk
@@ -102,9 +102,9 @@
 
 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
+    Instance Variables
         diffClass:      <Class> Should be a subclass of GenericDiff. Used to resolve changes.
         file0:          <SequenceableCollection> The ancestral file.
         file1:          <SequenceableCollection> The left branch.
@@ -468,9 +468,9 @@
 
 documentation
 "
-A Diff3Chunk is a subclass of DiffChunk that also knows which side of a three-way merge it represents.
+    A Diff3Chunk is a subclass of DiffChunk that also knows which side of a three-way merge it represents.
 
-Instance Variables
+    Instance Variables
         side:           <Symbol> One of #left, #original or #right
 
     [author:]
@@ -652,9 +652,9 @@
 
 documentation
 "
-A Diff3Conflict represents a merge conflict.
+    A Diff3Conflict represents a merge conflict.
 
-Instance Variables
+    Instance Variables
         left:           Either a SequenceableCollection or a Diff3Chunk representing the left variant.
         original:       Either a SequenceableCollection or a Diff3Chunk representing the original variant.
         right:          Either a SequenceableCollection or a Diff3Chunk representing the right variant.
@@ -834,10 +834,10 @@
 !Diff3 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Diff3.st,v 1.2 2014-02-05 19:13:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Diff3.st,v 1.3 2014-02-25 07:00:13 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Diff3.st,v 1.2 2014-02-05 19:13:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Diff3.st,v 1.3 2014-02-25 07:00:13 cg Exp $'
 ! !