--- a/DiffTextView.st	Fri Nov 18 15:55:20 2005 +0100
+++ b/DiffTextView.st	Fri Nov 18 15:55:31 2005 +0100
@@ -506,8 +506,13 @@
                             line1 string withoutTrailingSeparators = line2 string withoutTrailingSeparators ifTrue:[
                                 line1 := line1 string.
                                 line2 := line2 string.
+                            ] ifFalse:[
+                                line1 withoutSeparators withTabsExpanded = line2 withoutSeparators withTabsExpanded
+                                ifTrue:[
+                                    line1 := line1 string.
+                                    line2 := line2 string.
+                                ]
                             ].
-
                             l1 add:line1.
                             l2 at:idx1 put:line2.
                         ] ifFalse:[
@@ -537,6 +542,12 @@
                                 line1 string withoutTrailingSeparators = line2 string withoutTrailingSeparators ifTrue:[
                                     line1 := line1 string.
                                     line2 := line2 string.
+                                ] ifFalse:[
+                                    line1 withoutSeparators withTabsExpanded = line2 withoutSeparators withTabsExpanded
+                                    ifTrue:[
+                                        line1 := line1 string.
+                                        line2 := line2 string.
+                                    ]
                                 ].
                                 l2 add:line2.
                                 l1 at:idx2 put:line1.
@@ -631,5 +642,5 @@
 !DiffTextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.41 2005-10-13 16:24:58 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DiffTextView.st,v 1.42 2005-11-18 14:55:31 cg Exp $'
 ! !