diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2023-08-12 08:02:18 +0000 |
|---|---|---|
| committer | Sergio Carlavilla Delgado <carlavilla@FreeBSD.org> | 2023-08-12 08:02:18 +0000 |
| commit | 423fb87ca0ba28d019541a29ae3a971942179967 (patch) | |
| tree | fbf626f5428ee976f5f112d81730f27dd0b09ae6 | |
| parent | 92179ea675b6f6e1ac02e7126ed036c54b883a56 (diff) | |
| download | doc-423fb87ca0ba28d019541a29ae3a971942179967.tar.gz doc-423fb87ca0ba28d019541a29ae3a971942179967.zip | |
Handbook - Cutting Edge: Expand information about mergemaster
Approved by: bcr@, ygy@
Differential Revision: https://reviews.freebsd.org/D21559
| -rw-r--r-- | documentation/content/en/books/handbook/cutting-edge/_index.adoc | 7 |
1 files changed, 7 insertions, 0 deletions
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 |