From nobody Sun Mar 1 11:38:16 2026 X-Original-To: dev-commits-src-main@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 4fP0S840wqz6Snnj for ; Sun, 01 Mar 2026 11:38:16 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP0S83CHRz3trc for ; Sun, 01 Mar 2026 11:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772365096; 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=wpDKo/HeC0lU0r1QJZ/LoNXkm+u6etFw2CdRdFxfOMk=; b=nkehZhbivznEN1qnUWwaI7sMQI5PbS53fRMVMyFxI03hIIRohS22NkZ2mS8FJEGuR4poRA WxN7GJLC1egsQ8vPDX7S5/eCLQ6Y+qjmeUGS7IKSsjaDwvW7rGzG3DdLOOd90DY+SyVPLU 9HDR03Twt+Qhmk4Y4O3dXezYt5j+fVTa4Dp5NuFwpJr5gkYzJ3I7YYM6j9gkvIKIFSXu7f 1Apl50vW7+3hPj3WwC+kJwmhSjXThKkH50XztfVpyIdar/PYQ3pgV/mh4EMtb4ufCVtFX0 WLOQoVPd3Q0fLNEG9sTnVP9rz9cINuGPMkQhroF7/CJGvAHn3X8qc2FIDaJ9Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772365096; a=rsa-sha256; cv=none; b=vLvCj/jq2Xcr51vYo2C3nMWavd3Mz96I/7pyocinWemBNS7+QciwPZ75pPLtG3kVOjOvMw 3OVZVMZhlMFex6EoIuuam57q5E3y1Hj5V9HYgUTlW7EKwt4c+/Lr8Qf+SYKEScelNBJvXl 7eAYxe+3VeeFgoICSMTYEVPpKFXLYLeHgyr1ryTMUGh+hxDapu5sJzyUbiCd1fJuzn0gZQ 3XxAoB+1qtAbQO1vj++XibaRHyCYLogCCe9lF1/m/8fipjQLKadURe31xVdQVEHFsnvk0d oskjA5za2g9EKFJB7Ye3PEbdFgtmLLu6hu0KwgrTFOgEQYgy+kyf2AwB3DfHfw== 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=1772365096; 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=wpDKo/HeC0lU0r1QJZ/LoNXkm+u6etFw2CdRdFxfOMk=; b=xte6X1YDWWZvmzBEW/lxpIRPVvQEiiMsoaPJrwuKycEzz5nW6fSS8wQAhZx6CKIXXxzw+h 3sLcjle0BSlqvh2vtuOA/7lC26OuycgAyIPGy/Ce4+4BjFUXQ01rDEMP6E18Uf5HelIE4U Oex3sxYERVTsgvnOFnfV3Hc5mfoJ0vCu7nViRj+lcN/Cx9d8EIT1EDcqO67CBopWiZg1u3 g1+p7Fy2coqCQCYjq+f6GpJ3cf9Z1Zc2N/2cS23/qQk7+aZGGXkkyyGUQM7H9ZIyv4E4VK trgQTTTLwRyuBX6Yo9jLneSndL1oEOb3Mbup6MqMrI4adaLO+/kN+niPd1rT1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fP0S82WQYznNg for ; Sun, 01 Mar 2026 11:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a434 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Mar 2026 11:38:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5ddfd1db271c - main - diff3: bump version to the date when the GNU diff3 compat was reached List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 5ddfd1db271cc675997a942da599c342ccb53afa Auto-Submitted: auto-generated Date: Sun, 01 Mar 2026 11:38:16 +0000 Message-Id: <69a42528.3a434.6dec3867@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5ddfd1db271cc675997a942da599c342ccb53afa commit 5ddfd1db271cc675997a942da599c342ccb53afa Author: Baptiste Daroussin AuthorDate: 2026-03-01 11:37:24 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-01 11:37:24 +0000 diff3: bump version to the date when the GNU diff3 compat was reached --- usr.bin/diff3/diff3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index c33e3275d006..fce4d353af69 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -157,7 +157,7 @@ static void increase(void); static void usage(void); static void printrange(FILE *, struct range *); -static const char diff3_version[] = "FreeBSD diff3 20240925"; +static const char diff3_version[] = "FreeBSD diff3 20260213"; enum { DIFFPROG_OPT,