--- a/Diff3ExclusiveVisitor.st Tue Feb 25 08:00:13 2014 +0100
+++ b/Diff3ExclusiveVisitor.st Tue Feb 25 08:00:15 2014 +0100
@@ -33,7 +33,7 @@
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
- category:'Collections-Sequenceable-Diff3'
+ category:'Collections-Sequenceable-Diff'
!
Diff3ExclusiveVisitor comment:'A Diff3ExclusiveVisitor is used by Diff3 to construct a three-way SequenceableCollection merge that resolves "false conflicts" (a.k.a "accidental clean merges") by accepting the changed text as a non-conflict in the merge result.
@@ -87,7 +87,6 @@
merge that resolves 'false conflicts' (a.k.a 'accidental clean merges') by accepting the
changed text as a non-conflict in the merge result.
-
[author:]
Tony Garnock-Jones <tonyg@lshift.com>
@@ -118,10 +117,10 @@
!Diff3ExclusiveVisitor class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Diff3ExclusiveVisitor.st,v 1.1 2014-02-05 19:08:07 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Diff3ExclusiveVisitor.st,v 1.2 2014-02-25 07:00:15 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Diff3ExclusiveVisitor.st,v 1.1 2014-02-05 19:08:07 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Diff3ExclusiveVisitor.st,v 1.2 2014-02-25 07:00:15 cg Exp $'
! !