git: fa4651d7ea5b - main - build.7: remove reference to deprecated mergemaster

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

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Fri, 05 May 2023 01:19:13 UTC

The branch main has been updated by emaste:

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

commit fa4651d7ea5bd7679e7ac5f17cd28581bb8db57f
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-03-03 13:54:22 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-05-05 01:14:06 +0000

    build.7: remove reference to deprecated mergemaster
    
    Sponsored by:   The FreeBSD Foundation
---
 share/man/man7/build.7 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 4e499c81b45c..a2fb5ea77149 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -887,7 +887,6 @@ manpage first appeared in
 .Xr tests 7 ,
 .Xr config 8 ,
 .Xr etcupdate 8 ,
-.Xr mergemaster 8 ,
 .Xr reboot 8 ,
 .Xr shutdown 8
 .Sh AUTHORS