Date: Fri, 13 Feb 2026 19:26:06 +0000 From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 4d5c434ed16e - main - diff3: use bsd diff3 by default Message-ID: <698f7ace.3dff0.583e87ed@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4d5c434ed16e821003a9c2dc1c1ea245b8d0b678 commit 4d5c434ed16e821003a9c2dc1c1ea245b8d0b678 Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2026-02-13 17:44:12 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2026-02-13 19:26:02 +0000 diff3: use bsd diff3 by default --- share/mk/src.opts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 5aae1eafedd7..bd70c668ca6d 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -102,7 +102,6 @@ __DEFAULT_YES_OPTIONS = \ FREEBSD_UPDATE \ FTP \ GAMES \ - GNU_DIFF \ GOOGLETEST \ GPIO \ HAST \ @@ -209,6 +208,7 @@ __DEFAULT_NO_OPTIONS = \ DTRACE_ASAN \ DTRACE_TESTS \ EXPERIMENTAL \ + GNU_DIFF \ HESIOD \ IPFILTER_IPFS \ LOADER_VERBOSE \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?698f7ace.3dff0.583e87ed>