diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2011-04-10 03:53:06 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2011-04-10 03:53:06 +0000 |
| commit | f415f37c1164f9c592e5ab527e8e3a09797f0b92 (patch) | |
| tree | ad8518fba65cd72ea8ca45799dcf171ec0e072d1 /Makefile | |
| parent | 4ac80906c36ed143bad48b66dc1705a9a7caf3a4 (diff) | |
| download | src-f415f37c1164f9c592e5ab527e8e3a09797f0b92.tar.gz src-f415f37c1164f9c592e5ab527e8e3a09797f0b92.zip | |
Update recommendation for mergemaster. The -a and -i options are exclusive.
PR: docs/156271
Submitted by: Fedor Dikarev <fedor.dikarev@gmail.com>
Notes
Notes:
svn path=/head/; revision=220512
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) # |