git: 5778700fb8c5 - main - diff3: Add SPDX-License-Identifier tag

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Tue, 03 Mar 2026 19:44:15 UTC

The branch main has been updated by emaste:

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

commit 5778700fb8c54a33e5bb00a4a0c4e40fde2edbd9
Author:     Tuukka Pasanen <tuukka.pasanen@ilmi.fi>
AuthorDate: 2026-02-12 09:27:34 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2026-03-03 19:43:21 +0000

    diff3: Add SPDX-License-Identifier tag
    
    Reviewed by: bapt
    Sponsored by: The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D55462
---
 usr.bin/diff3/diff3.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c
index 0f114163321f..d85a5da94b10 100644
--- a/usr.bin/diff3/diff3.c
+++ b/usr.bin/diff3/diff3.c
@@ -1,6 +1,8 @@
 /*	$OpenBSD: diff3prog.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $	*/
 
 /*
+ * SPDX-License-Identifier: Caldera-no-preamble AND BSD-3-Clause
+ *
  * Copyright (C) Caldera International Inc.  2001-2002.
  * All rights reserved.
  *