--- a/ChangeSetDiffEntry.st Wed Jan 16 11:55:57 2013 +0000
+++ b/ChangeSetDiffEntry.st Thu Jan 17 17:02:15 2013 +0000
@@ -342,6 +342,16 @@
"Modified (comment): / 09-04-2012 / 18:01:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!ChangeSetDiffEntry methodsFor:'private'!
+
+sort:sortBlock
+ "superclass ChangeSetDiffComponent says that I am responsible to implement this method"
+
+ "Ignored"
+
+ "Modified: / 17-01-2013 / 13:57:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!ChangeSetDiffEntry methodsFor:'testing'!
isConflict
@@ -405,9 +415,9 @@
!ChangeSetDiffEntry class methodsFor:'documentation'!
version
- ^ '$Id: ChangeSetDiffEntry.st 1957 2012-09-05 11:45:38Z vranyj1 $'
+ ^ '$Id: ChangeSetDiffEntry.st 1986 2013-01-17 17:02:15Z vranyj1 $'
!
version_SVN
- ^ '$Id: ChangeSetDiffEntry.st 1957 2012-09-05 11:45:38Z vranyj1 $'
+ ^ '$Id: ChangeSetDiffEntry.st 1986 2013-01-17 17:02:15Z vranyj1 $'
! !