From nobody Fri Feb 13 19:26:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fCMbL3ybNz6RfHX for ; Fri, 13 Feb 2026 19:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCMbL2RsBz3F9c for ; Fri, 13 Feb 2026 19:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771010766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fmEwqh6HEypz6wh784UPD1fu+HFpSi+3zZHEuRjpAEs=; b=uTWOdTBx+HfIMtFez/hj3NCL0hGPaFTAG0HRc8B4uHleIJ+FClFGiLNQGAcKXrvLYigqYN yPGxAnEm8MY/yNYDrDQxQSDQ7AoOW5WElltxnFUjZq1st9R3QQTY7huOJd+amlUNxkH6F0 sSX4lE7t4ZpHBqDSFC47KVY6Pl4JS3qUY2XRRPcwal1U0iBJPEAT8l0ZFnayIy0h0HBTZC 2HhmG4pDZr2T598rJOPQ7BRO8emP4OP0SAkhGvHQklwShqP82uIj+YkNFetUKv8vgbOE2P vMLQOAs6Ew4GYPD2oavCz6d17zoWuGwptYDMsiSO0k2QQlVUZ5nu/IqLWEFD0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771010766; a=rsa-sha256; cv=none; b=pw1gIILiJyHuMee9o+U2fQIMFbuwXJnhCHSuOszRspBsCAOa8m8bbKtc45+rIYnjBToYTG H49IlW1IJxAbJmr53Fz8K+GujHIw0MfET+Trgy8Pvfqn5C1JpWPifNNKpy6qMdH+8Ww0HM te76hCFm+XTTgnBTySpXD0XnAJorXscLK0DFI0JxOLog7u7mYwXX4QjOsNMs74DmcGFUUK kx3ML+Ho8jpPhcwEmCL7q4mAUfwH91/YATaQfj+nJgf62e034uT9HmfXYuan7m2nR6BayX 9JONcEs4RdzQUsN6ikq7m21uBT2Ry2GX31WIszLONPXDpvXmiOafAtBdNbby0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771010766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fmEwqh6HEypz6wh784UPD1fu+HFpSi+3zZHEuRjpAEs=; b=tka0jg56+ncoEE4BTCR0Vecktv6OGUvU6CYYDuMRxE1zPgNs+xbRW+Ph5DZyHMMsklGeRD gblwAK2cb87W9+LagNVYh0qnsSc3EbibpBJGONPLJoVH53k8P8VsuU4MTRqgYU7/kaNXBj Zc9FsFMe3bpao6evUwXsOYB7jTHfBOTsGrI+BOsOB8TbEWKn2Rlr3SEvroqBAdPeIs8TQ0 +66b/qPj0rGJ0wgnTek118cKZ5pCwditsTqMwmyubcy2+zKzQXFf76E9lLvkGwdLCMhU/h v1K7D751ljHTaLzL5RFrdGfs9xoffo9rS4PVD2Q8m5xyUqyQ2NgslvSu0fC1mA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCMbL13Y5zbCK for ; Fri, 13 Feb 2026 19:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dff0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 19:26:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 4d5c434ed16e - main - diff3: use bsd diff3 by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d5c434ed16e821003a9c2dc1c1ea245b8d0b678 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 19:26:06 +0000 Message-Id: <698f7ace.3dff0.583e87ed@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4d5c434ed16e821003a9c2dc1c1ea245b8d0b678 commit 4d5c434ed16e821003a9c2dc1c1ea245b8d0b678 Author: Baptiste Daroussin AuthorDate: 2026-02-13 17:44:12 +0000 Commit: Baptiste Daroussin 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 \