git: 6e1a7ade2169 - stable/13 - mergemaster: postpone removal to FreeBSD 15

The branch stable/13 has been updated by emaste:

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

commit 6e1a7ade216905cb8befde9eeb6af8e0527156ab
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-04-16 14:19:14 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-06-18 14:20:41 +0000

    mergemaster: postpone removal to FreeBSD 15
    
    Mergemaster has been deprecated for quite some time, but was not
    removed prior to FreeBSD 14.0.  Update the deprecation notice in the man
    page to reflect this.
    
    PR:             274967
    Reported by:    naddy
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 73cce7d8886bc59284c757decb49deba046e73fc)
    (cherry picked from commit c0e5d8f9bda7907c83901d25d1d123a5b180443f)
---
 usr.sbin/mergemaster/mergemaster.8 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 695f1bba3474..20d746de347c 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 2, 2023
+.Dd April 16, 2024
 .Dt MERGEMASTER 8
 .Os
 .Sh NAME
@@ -45,7 +45,7 @@
 The
 .Nm
 utility is deprecated and may not be available in
-.Fx 14.0
+.Fx 15.0
 or later.
 Users are advised to use
 .Xr etcupdate 8