Differences From:

File src/merge3.c part of check-in [ac6bb3ce06] - Improvements to the merge algorithm so that it works better for common changes. Still more work needed. by drh on 2007-11-07 22:22:02. [view]

To:

File src/merge3.c part of check-in [57b2735ebd] - Enhanced text diff subroutine uses Myers enhancements to Wagners minimum edit distance algorithm. White space at the end of lines is ignored. by drh on 2007-11-15 21:49:14. [view]

@@ -25,9 +25,9 @@
 */
 #include "config.h"
 #include "merge3.h"
 
-#if 0
+#if 1
 # define DEBUG1(X) X
 #else
 # define DEBUG1(X)
 #endif