From nobody Sun Mar 22 08:05:57 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 4fdplT3FPlz6W9SJ for ; Sun, 22 Mar 2026 08:05:57 +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 4fdplT1G02z3Z0d for ; Sun, 22 Mar 2026 08:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774166757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4t26RgHBjgRzkkdpOOT+m6aji7rO/5ts3zvulmTSMGQ=; b=BARuDnLcnHJFZ2Li9AEftgX7/vcVnlbJb/u5PS5p7gxCwxetO5V8d129DHQJ+VkQQE4eYN OIh9iH7RC/CTQejp0A0KxcakbFMzRNxRkWqbz4+8VR0c2b8BnjfNQhu3MYmT/oNulR1TX8 fT+mo90hXrsgEAamkzHxcs18o8/1Y/sBS6wW4plNLEBm/risNOc9obx9IwrrPNaYTvIYLK 3tr2cMoKTs03HA3dFqgx4budKK84fiXRau9na3BIkTinIdjT4p+NL133DyIGA/T/j80GR9 0hexlJH43a+aUrS+eNtki3qfUgE9oX+FFzpbzmrjjR0X9f74UZYhpcqkZC/jnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774166757; a=rsa-sha256; cv=none; b=A1bprYgKQXqjuoEAQUXLdQEHz5nJPssEqwHOSda8oIv2qpEug61aeSJ9b8L3hKCb3u2Zvr mm5oYmxFQ5UZfFIo2KLYvkAA2eJPhGn+gy8WGfgMHEee+Xjy9YXUL6TUrLe1Q4XHXO++N9 kzQ6aTn5m/TVUgcCRcLksRCdtmWL2XNcYybpzxUSwXE2hI8/NFhDwFipyOsievFAjEFzUR E2REPBhj8weQKk1gL3T8tkqjJCi9HZVhfEdRGWB7GKKUMcMYe/nj+RW0AYFSSJzFPwayxm chvtk2ujaUjBVjQTInV+EheaOrnrh19SF3r1LTE6J0RZm/8w53pPaMoLlIypew== 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=1774166757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4t26RgHBjgRzkkdpOOT+m6aji7rO/5ts3zvulmTSMGQ=; b=xXkyrQf8bQuIDE1zTTiJM1jzYgZ4i/PcROsJMiQiVIq5rwg3Jza98VbBfWV8gDpaUE+tzr tpqtfL1/AZjWg9zEnH8ejBDIflBSnQ46rJjfqc/a/zWukvMtlWDtbD3ZbyBzwMOzwSzaL6 VSvO3EiXE08RcqzYju6yY/aMqtePLFbRDcC8frEpF5HkSfqEncTYpEQfmAmceEeCnPOMFe dqn6wTlX8FKmjlpoNTrPKMNRouPfAz0cYCn3e5XTKWaqA1kU7dLSX7g7fKp+m0SNu++of5 FXH9P8miT8ahEIxBtak+9FjPcSKmWmMRCOFUYlFNTdCzLwU/SDWhQfztfUKQuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdplT08sBzrZS for ; Sun, 22 Mar 2026 08:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c3cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 08:05:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: feef48d5fe91 - stable/15 - diff3: bump version to the date when the GNU diff3 compat was reached 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: feef48d5fe911deeaa5c2949a0465a3717682353 Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 08:05:57 +0000 Message-Id: <69bfa2e5.1c3cc.1d730231@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=feef48d5fe911deeaa5c2949a0465a3717682353 commit feef48d5fe911deeaa5c2949a0465a3717682353 Author: Baptiste Daroussin AuthorDate: 2026-03-01 11:37:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-22 02:04:59 +0000 diff3: bump version to the date when the GNU diff3 compat was reached (cherry picked from commit 5ddfd1db271cc675997a942da599c342ccb53afa) --- 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,