From nobody Sun Mar 1 11:38:16 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 4fP0SF5ynnz6Sp8h for ; Sun, 01 Mar 2026 11:38:21 +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 4fP0SF4QpBz3v2p for ; Sun, 01 Mar 2026 11:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772365101; 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=c4yX2ZW8jF6da0QYH0EN15fQitydU4Mfg/haMvFMC2cRjscCPaMfybBk26DBaBVS1HKZr7 rzl2sxHrBPUouoeZEN9ItAQIJTNdn3MCPrV1kPHASjSynRuVoQ14vDAQen9flbQGmNrrhP fpuhpVHPg6opUmb44TUqu4glP0o8a42Mx4ghfjjwabqX2cO9NJQ15Gnc+Jp9WYY7sxgG+G mZ42cy4UnS3XF26uwuKmmqHwOQkBN4fVdA2/ukeQ0dnb8e4NSbxrJHXFQmYPIbg2Z8BawU ijOOeNvwqxMN0/2U5N0tYWE0oBo9n4hzblWHyKv1hTsAGTu4moctVkA+fqcaUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772365101; a=rsa-sha256; cv=none; b=lqkum/mG67HqR4mdjVGB13gXJt2UMu7sy64ByKYhZl2CEKfCmTryJMzQUlnKBkJsOehgOB TX2oRyQfj1hpOw7qliugybZmZTbbASdwcar1HdAH+drgrYtouX8henZNdpaUjdC+vE0aHf Dpm6AENJ9LYZ+bL9va921Fnc9MV4MLg+TipfmiH/0rQg4dNN+4xjxnawi/oywtAHbt8a5t 7waXX8k4Mei8iERyUe/aLV3lv+fz1bXluMzo2LeaHflPWPqxpkRnibDEGrjCFy7p0Lq1bq nRIc4v93RQjpLUZ8BG7+iOOEsBWzgFo4j68oIyZ5IBKmJ8Vn98HoCgg6A+1gOA== 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=1772365101; 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=xGain1radX59J6TeCGchNFKI8CUPHviQ5On6SvcNrAOd2GOZxscL01TjWQh1ye2EenQFq6 XoRiRt4iPjwhdWd3ZXEMvVapJvHioZlNxxfGfWLx0MPcu9Pm9kInaw819q6smhXUZC2JHU Avk40Jhhh3R3170N9jqYGDSzP+QKTcfgT1l2jHpZgnUtA5ElCihEmgD7sTm3HeN4VR/eF8 OmtRUIcEKdXiPUBEA3zKMX4uW9MLBAAU8sErBDsktq1ME8D/InXfyv62t/x3TqBFd7wOoV 95HN1iJaZ5nkmmunc1uhS5mFnWrz129nlNYBiLKOT6lGFVbQTuJRQg2DrlqryQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fP0SF3kjZznlq for ; Sun, 01 Mar 2026 11:38:21 +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 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: 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,