--- a/ChangeSetDiffComponent.st Fri Mar 22 11:11:55 2013 +0000
+++ b/ChangeSetDiffComponent.st Thu Mar 28 12:22:48 2013 +0000
@@ -65,12 +65,14 @@
"
! !
+
!ChangeSetDiffComponent class methodsFor:'others'!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic3/ChangeSetDiffComponent.st,v 1.4 2012/07/31 12:34:40 vrany Exp §'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffComponent.st,v 1.4 2012-07-31 12:34:40 vrany Exp $'
! !
+
!ChangeSetDiffComponent methodsFor:'accessing'!
changesetA
@@ -187,6 +189,7 @@
"Created: / 20-03-2012 / 13:31:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!ChangeSetDiffComponent methodsFor:'change & update'!
changed: aspect with: param
@@ -198,6 +201,7 @@
"Created: / 24-11-2009 / 12:58:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!ChangeSetDiffComponent methodsFor:'enumerating'!
do: aBlock
@@ -207,6 +211,7 @@
"Created: / 25-11-2009 / 10:22:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!ChangeSetDiffComponent methodsFor:'printing & storing'!
printOn:aStream
@@ -220,6 +225,7 @@
"Modified: / 26-11-2009 / 16:25:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!ChangeSetDiffComponent methodsFor:'private'!
flattenOn: stream
@@ -241,6 +247,7 @@
"Created: / 17-01-2013 / 13:57:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!ChangeSetDiffComponent methodsFor:'testing'!
isConflict
@@ -284,6 +291,7 @@
^ self subclassResponsibility
! !
+
!ChangeSetDiffComponent class methodsFor:'documentation'!
version
@@ -296,6 +304,6 @@
!
version_SVN
- ^ '§Id: ChangeSetDiffComponent.st 1986 2013-01-17 17:02:15Z vranyj1 §'
+ ^ '§Id: ChangeSetDiffComponent.st 1920 2012-04-18 20:21:56Z vranyj1 §'
! !