From 47f77d8c57533e10da9e78d2c2c20ff41beaf80e Mon Sep 17 00:00:00 2001 From: Ben Smithurst Date: Fri, 24 Nov 2000 10:22:08 +0000 Subject: [PATCH] Mention mergemaster(8). Submitted by: obrien --- share/man/man7/build.7 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 075dcf8cbb67..0f74222a1698 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -126,6 +126,7 @@ make buildworld make buildkernel KERNEL=FOO make installkernel KERNEL=FOO make installworld +mergemaster .Ed .Pp .Dq FOO @@ -157,6 +158,7 @@ may not work with the old kernel which is still running. .Xr make 1 , .Xr make.conf 5 , .Xr ports 7 , +.Xr mergemaster 8 , .Xr reboot 8 , .Xr shutdown 8 .Sh AUTHORS