# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 974396109 -3600
# Node ID ebc382a8d67fcd724768e978673b940f69e7fbcc
# Parent  1d2fabb348d23d1c03e2b8076ac17867ce94f50b
checkin from browser

diff -r 1d2fabb348d2 -r ebc382a8d67f 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 $'
 ! !