Mention -U and -ai arguments to mergemaster in a comment for the

general mergemaster line. MFC after: 3 days Suggested by: Ben Laurie
2008-04-29 09:08:33 +00:00 · 2008-04-29 09:08:33 +00:00 · fbf4979ac2
commit fbf4979ac2
parent 6e679990b9
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -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)
 #