git: df5b2cf2b31b - main - Complete removal of GNU diff

From: Dag-Erling Smørgrav <des_at_FreeBSD.org>
Date: Tue, 10 Mar 2026 08:22:37 UTC
The branch main has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=df5b2cf2b31bf66e3b21c772b39f6cc6406dcb7b

commit df5b2cf2b31bf66e3b21c772b39f6cc6406dcb7b
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-03-10 08:21:32 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-03-10 08:21:32 +0000

    Complete removal of GNU diff
    
    Fixes:          9a44e42a2b8f ("Retire GNU diff3")
    Reviewed by:    emaste
    Differential Revision:  https://reviews.freebsd.org/D55423
---
 usr.bin/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index d536f26ab0da..6ca784ef6cb6 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -29,6 +29,7 @@ SUBDIR=	apply \
 	ctlstat \
 	cut \
 	diff \
+	diff3 \
 	dirname \
 	dtc \
 	du \
@@ -206,7 +207,6 @@ SUBDIR.${MK_GAMES}+=	pom
 SUBDIR.${MK_GAMES}+=	primes
 SUBDIR.${MK_GAMES}+=	random
 SUBDIR+=		gh-bc
-SUBDIR+=		diff3
 SUBDIR.${MK_HESIOD}+=	hesinfo
 SUBDIR.${MK_ICONV}+=	iconv
 SUBDIR.${MK_ICONV}+=	mkcsmapper