summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2008-04-29 09:08:33 +0000
committerrwatson <rwatson@FreeBSD.org>2008-04-29 09:08:33 +0000
commitb02f65b6496ae4cc324f8fc027eefdfb256a134a (patch)
treedcc556d5783e788b1b7e13ea20f3f558f1f36b2b /Makefile
parent3d7aa5ca505648066c82269a120f8a4973bcd0f3 (diff)
downloadFreeBSD-src-b02f65b6496ae4cc324f8fc027eefdfb256a134a.zip
FreeBSD-src-b02f65b6496ae4cc324f8fc027eefdfb256a134a.tar.gz
Mention -U and -ai arguments to mergemaster in a comment for the
general mergemaster line. MFC after: 3 days Suggested by: Ben Laurie
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5265f4f..a020a85 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@
# 6. `mergemaster -p'
# 7. `make installworld'
# 8. `make delete-old'
-# 9. `mergemaster'
+# 9. `mergemaster' (you may wish to use -U or -ai).
# 10. `reboot'
# 11. `make delete-old-libs' (in case no 3rd party program uses them anymore)
#
OpenPOWER on IntegriCloud