Differences From:

File test/tester.tcl part of check-in [dbda8d6ce9] - Initial check-in of m1 sources. by drh on 2007-07-21 14:10:57. [view]

To:

File test/tester.tcl part of check-in [36b96b8616] - Rework the merge algorithm. It now only works for text files. But, it no longer gets confused by line endings (\r\n versus \n) and it reports conflicts. by drh on 2007-11-16 20:42:31. Also file test/tester.tcl part of check-in [d0305b305a] - Merged mainline into my branch to get the newest application. by aku on 2007-12-05 08:07:46. [view]

@@ -88,9 +88,13 @@
 
 # Return true if two files are the same
 #
 proc same_file {a b} {
-  return [expr {[read_file $a]==[read_file $b]}]
+  set x [read_file $a]
+  regsub -all { +\n} $x \n x
+  set y [read_file $b]
+  regsub -all { +\n} $y \n y
+  return [expr {$x==$y}]
 }
 
 # Perform a test
 #