commit 950435fdd34fce306f6083edd389d03f7c8417ba
from: Stefan Sperling <stsp@stsp.name>
date: Sun Oct 06 18:48:11 2019 UTC

remove pointless debug code from diff3.c

commit - 18b9ebab6e93f7d3714f10adf4b4f48eec65abd2
commit + 950435fdd34fce306f6083edd389d03f7c8417ba
blob - 508a24f918ed10989efdecc725c172aeef9818e6
blob + db5338772d9189502c14c2cd7dd82e650b39ce3a
--- lib/diff3.c
+++ lib/diff3.c
@@ -140,7 +140,6 @@ struct diff3_state {
 	 * is stored in last[1-3];
 	 */
 	int last[4];
-	int debug;
 	char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* markers for -E and -X */
 
 	char *buf;
@@ -717,14 +716,6 @@ merge(size_t m1, size_t m2, struct diff3_state *d3s)
 		if (!t1 && !t2)
 			break;
 
-		if (d3s->debug) {
-			printf("%d,%d=%d,%d %d,%d=%d,%d\n",
-			d1->old.from, d1->old.to,
-			d1->new.from, d1->new.to,
-			d2->old.from, d2->old.to,
-			d2->new.from, d2->new.to);
-		}
-
 		/* first file is different from others */
 		if (!t2 || (t1 && d1->new.to < d2->new.from)) {
 			/* stuff peculiar to 1st file */