checkin from browser
authorClaus Gittinger <cg@exept.de>
Thu, 16 Nov 2000 18:35:09 +0100
changeset 2852 ebc382a8d67f
parent 2851 1d2fabb348d2
child 2853 856dc62f02d7
checkin from browser
Diff3TextView.st
--- a/Diff3TextView.st	Thu Nov 16 18:34:35 2000 +0100
+++ b/Diff3TextView.st	Thu Nov 16 18:35:09 2000 +0100
@@ -214,7 +214,7 @@
     ].
 
     l1 notNil ifTrue:[
-        state ~~ #initial ifTrue:[self halt].
+        state ~~ #initial ifTrue:[self halt:'oops - should not happen ...'].
 
         "/ diff3-output is sometimes stupid; fix some here
         [l1 notEmpty and:[l2 notEmpty and:[l1 first = l2 first or:[l1 first withTabsExpanded = l2 first withTabsExpanded]]]] whileTrue:[l1 removeFirst. l2 removeFirst].
@@ -385,5 +385,5 @@
 !Diff3TextView class methodsFor:'documentation'!
 
 version
-^ '$Header: /cvs/stx/stx/libtool/Diff3TextView.st,v 1.6 2000-11-16 17:34:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Diff3TextView.st,v 1.7 2000-11-16 17:35:09 cg Exp $'
 ! !