diff options
| author | dougb <dougb@FreeBSD.org> | 2011-04-10 03:53:06 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2011-04-10 03:53:06 +0000 |
| commit | f272389b998eee2f36fc988b1076ac4c6fd4cad4 (patch) | |
| tree | ad8518fba65cd72ea8ca45799dcf171ec0e072d1 /Makefile | |
| parent | 2f8e8fa58783cf1dce22dfd3c608de22d5da6917 (diff) | |
| download | FreeBSD-src-f272389b998eee2f36fc988b1076ac4c6fd4cad4.zip FreeBSD-src-f272389b998eee2f36fc988b1076ac4c6fd4cad4.tar.gz | |
Update recommendation for mergemaster. The -a and -i options are exclusive.
PR: docs/156271
Submitted by: Fedor Dikarev <fedor.dikarev@gmail.com>
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) # |
