Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Mar 2026 08:05:57 +0000
From:      Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Cc:        Baptiste Daroussin <bapt@FreeBSD.org>
Subject:   git: feef48d5fe91 - stable/15 - diff3: bump version to the date when the GNU diff3 compat was reached
Message-ID:  <69bfa2e5.1c3cc.1d730231@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=feef48d5fe911deeaa5c2949a0465a3717682353

commit feef48d5fe911deeaa5c2949a0465a3717682353
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2026-03-01 11:37:24 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
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,


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69bfa2e5.1c3cc.1d730231>