Date: Sat, 12 Aug 2023 08:03:14 GMT From: Sergio Carlavilla Delgado <carlavilla@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: 423fb87ca0 - main - Handbook - Cutting Edge: Expand information about mergemaster Message-ID: <202308120803.37C83EDD092344@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=423fb87ca0ba28d019541a29ae3a971942179967 commit 423fb87ca0ba28d019541a29ae3a971942179967 Author: Mark Linimon <linimon@FreeBSD.org> AuthorDate: 2023-08-12 08:02:18 +0000 Commit: Sergio Carlavilla Delgado <carlavilla@FreeBSD.org> CommitDate: 2023-08-12 08:02:18 +0000 Handbook - Cutting Edge: Expand information about mergemaster Approved by: bcr@, ygy@ Differential Revision: https://reviews.freebsd.org/D21559 --- documentation/content/en/books/handbook/cutting-edge/_index.adoc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/documentation/content/en/books/handbook/cutting-edge/_index.adoc b/documentation/content/en/books/handbook/cutting-edge/_index.adoc index c4505f0dd5..6b11ddc80d 100644 --- a/documentation/content/en/books/handbook/cutting-edge/_index.adoc +++ b/documentation/content/en/books/handbook/cutting-edge/_index.adoc @@ -1030,6 +1030,13 @@ With `-Ui`, man:mergemaster[8] automatically updates files that have not been us If a file must be manually merged, an interactive display allows the user to choose which portions of the files are kept. See man:mergemaster[8] for more information. +If the standard [.filename]#/usr/src# was not used, another parameter must be passed to man:mergemaster[8]: + +[source,shell] +.... +# mergemaster -Ui PATH_TO_SRC +.... + [[updating-src-completing-check-old]] ==== Checking for Outdated Files and Libraries
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308120803.37C83EDD092344>