--- a/ChangeSetDiffEntry.st	Wed Feb 05 18:52:35 2014 +0100
+++ b/ChangeSetDiffEntry.st	Wed Feb 05 18:52:37 2014 +0100
@@ -109,7 +109,7 @@
 !ChangeSetDiffEntry class methodsFor:'others'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffEntry.st,v 1.4 2012-07-31 12:34:18 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffEntry.st,v 1.5 2014-02-05 17:52:37 cg Exp $'
 ! !
 
 !ChangeSetDiffEntry methodsFor:'accessing'!
@@ -342,12 +342,50 @@
     "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
+    "Return true, if there is a conflict. For simple two-way diff,
+     conflict is when there are both versionA and versionB and they
+     differ. For three-way diff/merge, conflict is iff the entry is not
+     yet merged"
+
+    ^versionBase isNil ifTrue:[
+        "/two-way diff
+        versionA notNil and:[versionB notNil and:[(versionA sameAs: versionB) not]]
+    ] ifFalse:[
+        self isMerged not
+    ].
+
+    "Created: / 01-08-2012 / 17:10:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 isDiffItem
     ^ true
 !
 
+isForCopyrightMethod
+    "Returns true, if this is an entry for version method"
+
+    | version |
+
+    version := versionA ? versionB.
+    ^version isMethodCodeChange
+        and:[version isForMeta and: [version selector == #copyright]]
+
+    "Created: / 01-08-2012 / 16:39:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 isForVersionMethod
     "Returns true, if this is an entry for version method"
 
@@ -355,9 +393,10 @@
 
     version := versionA ? versionB.
     ^version isMethodCodeChange
-        and:[AbstractSourceCodeManager isVersionMethodSelector: version selector]
+        and:[(AbstractSourceCodeManager isVersionMethodSelector: version selector) or:[AbstractSourceCodeManager isExtensionsVersionMethodSelector: version selector]]
 
     "Created: / 18-04-2012 / 18:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-07-2013 / 13:17:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 isMerged
@@ -377,5 +416,6 @@
 !ChangeSetDiffEntry class methodsFor:'documentation'!
 
 version_SVN
-    ^ '§Id: ChangeSetDiffEntry.st 1927 2012-06-22 09:52:57Z vranyj1 §'
+    ^ '$Id: ChangeSetDiffEntry.st,v 1.5 2014-02-05 17:52:37 cg Exp $'
 ! !
+