Diff
Not logged in

Differences From:

File src/merge3.c part of check-in [e45d478f0c] - Improve merge conflict markings. by drh on 2009-03-20 01:23:53. [view]

To:

File src/merge3.c part of check-in [434830cc00] - Turn off the debugging prints that were left on by mistake in the previous check-in. by drh on 2009-03-20 01:26:14. [view]

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