Date: Wed, 30 Jul 2025 18:06:52 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 185bd9cf2199 - stable/14 - dtrace.1: Resolve merge conflict Message-ID: <202507301806.56UI6q2G046911@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=185bd9cf219999a38093e853bfda8ed1ca21fc5b commit 185bd9cf219999a38093e853bfda8ed1ca21fc5b Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2025-07-30 18:05:29 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2025-07-30 18:06:38 +0000 dtrace.1: Resolve merge conflict PR: 288556 Fixes: 0c91fa982437 ("dtrace_fbt.4: Document the DTrace fbt provider") --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 9cb6e9dd276f..0603a32da5e2 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,11 +20,7 @@ .\" .\" $FreeBSD$ .\" -<<<<<<< HEAD -.Dd June 14, 2025 -======= .Dd July 16, 2025 ->>>>>>> 9388c2887817 (dtrace_fbt.4: Document the DTrace fbt provider) .Dt DTRACE 1 .Os .Sh NAME
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202507301806.56UI6q2G046911>