Fossil SCM
Turn off the debugging prints that were left on by mistake in the previous check-in.
Commit
434830cc001251689aa6b6286b6c9ffc056adf65
Parent
e45d478f0c37add…
1 file changed
+1
-1
+1
-1
| --- src/merge3.c | ||
| +++ src/merge3.c | ||
| @@ -24,11 +24,11 @@ | ||
| 24 | 24 | ** This module implements a 3-way merge |
| 25 | 25 | */ |
| 26 | 26 | #include "config.h" |
| 27 | 27 | #include "merge3.h" |
| 28 | 28 | |
| 29 | -#if 1 | |
| 29 | +#if 0 | |
| 30 | 30 | #define DEBUG(X) X |
| 31 | 31 | #define ISDEBUG 1 |
| 32 | 32 | #else |
| 33 | 33 | #define DEBUG(X) |
| 34 | 34 | #define ISDEBUG 0 |
| 35 | 35 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -24,11 +24,11 @@ | |
| 24 | ** This module implements a 3-way merge |
| 25 | */ |
| 26 | #include "config.h" |
| 27 | #include "merge3.h" |
| 28 | |
| 29 | #if 1 |
| 30 | #define DEBUG(X) X |
| 31 | #define ISDEBUG 1 |
| 32 | #else |
| 33 | #define DEBUG(X) |
| 34 | #define ISDEBUG 0 |
| 35 |
| --- src/merge3.c | |
| +++ src/merge3.c | |
| @@ -24,11 +24,11 @@ | |
| 24 | ** This module implements a 3-way merge |
| 25 | */ |
| 26 | #include "config.h" |
| 27 | #include "merge3.h" |
| 28 | |
| 29 | #if 0 |
| 30 | #define DEBUG(X) X |
| 31 | #define ISDEBUG 1 |
| 32 | #else |
| 33 | #define DEBUG(X) |
| 34 | #define ISDEBUG 0 |
| 35 |