--- a/ChangeSetDiffEntry.st	Thu Oct 29 06:54:10 2015 +0100
+++ b/ChangeSetDiffEntry.st	Mon Nov 16 13:27:32 2015 +0000
@@ -26,6 +26,8 @@
 "
 "{ Package: 'stx:libbasic3' }"
 
+"{ NameSpace: Smalltalk }"
+
 ChangeSetDiffComponent subclass:#ChangeSetDiffEntry
 	instanceVariableNames:'versionBase versionA versionB versionMerged mergeInfo'
 	classVariableNames:''
@@ -283,8 +285,12 @@
     | merged |
     merged := versionMerged.
     (merged isNil and:[mergeInfo notNil]) ifTrue:[
+        | source |
+
+        source := mergeInfo text.
+        source isEmpty ifTrue:[ ^ nil ].
         merged := (versionA ? versionB ? versionBase) copy.
-        merged source: mergeInfo text.
+        merged source: source.
         merged isClassDefinitionChange ifTrue:[
             merged setupFromSource.
         ]
@@ -292,7 +298,7 @@
     ].
     ^merged
 
-    "Modified: / 21-03-2012 / 00:59:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 16-11-2015 / 13:19:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 versionMerged:aChange
@@ -415,6 +421,11 @@
 
 !ChangeSetDiffEntry class methodsFor:'documentation'!
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
     ^ '$Id: ChangeSetDiffEntry.st,v 1.5 2014-02-05 17:52:37 cg Exp $'
 ! !