Tools__ChangeSetDiffInfo.st
branchjv
changeset 12276 415495417f39
parent 12201 283826cb8bcc
child 12431 9f0c59c742d5
--- a/Tools__ChangeSetDiffInfo.st	Fri Aug 03 14:47:21 2012 +0100
+++ b/Tools__ChangeSetDiffInfo.st	Fri Aug 03 16:14:04 2012 +0100
@@ -129,7 +129,10 @@
 
 isMerge
 
-    ^specBase notNil and:[specMerge notNil]
+    ^
+"/    specBase notNil and:[
+        specMerge notNil
+"/    ]
 
     "Created: / 20-03-2012 / 10:23:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
@@ -154,5 +157,5 @@
 !ChangeSetDiffInfo class methodsFor:'documentation'!
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetDiffInfo.st 7947 2012-03-20 16:59:54Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetDiffInfo.st 8036 2012-08-03 15:14:04Z vranyj1 $'
 ! !