Diff3InclusiveVisitor.st
changeset 14010 268d0656c350
parent 13841 9991fe4fe333
child 15566 184cea584be5
--- a/Diff3InclusiveVisitor.st	Tue Feb 25 08:00:18 2014 +0100
+++ b/Diff3InclusiveVisitor.st	Tue Feb 25 08:00:21 2014 +0100
@@ -33,7 +33,7 @@
 	instanceVariableNames:'result okLines files'
 	classVariableNames:''
 	poolDictionaries:''
-	category:'Collections-Sequenceable-Diff3'
+	category:'Collections-Sequenceable-Diff'
 !
 
 Diff3InclusiveVisitor comment:'A Diff3InclusiveVisitor is used by Diff3 to construct a three-way SequenceableCollection merge that treats "false conflicts" (a.k.a "accidental clean merges") as true conflicts.
@@ -87,9 +87,10 @@
 
 documentation
 "
-A Diff3InclusiveVisitor is used by Diff3 to construct a three-way SequenceableCollection merge that treats 'false conflicts' (a.k.a 'accidental clean merges') as true conflicts.
+    A Diff3InclusiveVisitor is used by Diff3 to construct a three-way SequenceableCollection merge that treats 'false conflicts' 
+    (a.k.a 'accidental clean merges') as true conflicts.
 
-Instance Variables
+    Instance Variables
         files:          Used to extract the elements for each part of the result
         okLines:                Used to buffer up lists of non-conflicting elements
         result:                 Accumulator
@@ -155,10 +156,10 @@
 !Diff3InclusiveVisitor class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Diff3InclusiveVisitor.st,v 1.1 2014-02-05 18:59:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Diff3InclusiveVisitor.st,v 1.2 2014-02-25 07:00:21 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Diff3InclusiveVisitor.st,v 1.1 2014-02-05 18:59:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Diff3InclusiveVisitor.st,v 1.2 2014-02-25 07:00:21 cg Exp $'
 ! !