Update recommendation for mergemaster. The -a and -i options are exclusive.

PR: docs/156271 Submitted by: Fedor Dikarev <fedor.dikarev@gmail.com>
2011-04-10 03:53:06 +00:00 · 2011-04-10 03:53:06 +00:00 · f415f37c11
commit f415f37c11
parent 4ac80906c3
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -65,7 +65,7 @@
 #  6.  `mergemaster -p'
 #  7.  `make installworld'
 #  8.  `make delete-old'
-#  9.  `mergemaster'                         (you may wish to use -U or -ai).
+#  9.  `mergemaster'		(you may wish to use -i, along with -U or -F).
 # 10.  `reboot'
 # 11.  `make delete-old-libs' (in case no 3rd party program uses them anymore)
 #