--- a/Diff3Hunk.st Tue Feb 25 08:00:15 2014 +0100
+++ b/Diff3Hunk.st Tue Feb 25 08:00:16 2014 +0100
@@ -33,7 +33,7 @@
instanceVariableNames:'side oldChunk newChunk'
classVariableNames:''
poolDictionaries:''
- category:'Collections-Sequenceable-Diff3'
+ category:'Collections-Sequenceable-Diff'
!
Diff3Hunk comment:'A Diff3Hunk represents a change from the ancestor to either the left or the right branch as part of a three-way merge.
@@ -81,9 +81,9 @@
documentation
"
-A Diff3Hunk represents a change from the ancestor to either the left or the right branch as part of a three-way merge.
+ A Diff3Hunk represents a change from the ancestor to either the left or the right branch as part of a three-way merge.
-Instance Variables
+ Instance Variables
newChunk: <DiffChunk> The new content chunk
oldChunk: <DiffChunk> The old (ancestral) content chunk
side: <Symbol> Either #left or #right
@@ -158,10 +158,10 @@
!Diff3Hunk class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Diff3Hunk.st,v 1.1 2014-02-05 19:08:23 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Diff3Hunk.st,v 1.2 2014-02-25 07:00:16 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Diff3Hunk.st,v 1.1 2014-02-05 19:08:23 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Diff3Hunk.st,v 1.2 2014-02-25 07:00:16 cg Exp $'
! !