git: f10f288faf08 - main - diff3: Remove debugging remnant.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Sep 2024 21:13:15 UTC
The branch main has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=f10f288faf0808ca91aedab6fbb2c82d3a3b6532
commit f10f288faf0808ca91aedab6fbb2c82d3a3b6532
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2024-09-26 21:11:02 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2024-09-26 21:12:39 +0000
diff3: Remove debugging remnant.
Fixes: cf73401c4f7a
MFC after: 3 weeks
---
usr.bin/diff3/diff3.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c
index f20b1d74678d..39523f6e6b38 100644
--- a/usr.bin/diff3/diff3.c
+++ b/usr.bin/diff3/diff3.c
@@ -383,7 +383,6 @@ merge(int m1, int m2)
change(3, &d1->new, false);
} else if (eflag == EFLAG_OVERLAP) {
j = edit(d2, dup, j, DIFF_TYPE1);
- printdiff(d2);
}
d1++;
continue;