d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
PR:		docs/156271
Submitted by:	Fedor Dikarev <fedor.dikarev@gmail.com>
This commit is contained in:
dougb 2011-04-10 03:53:06 +00:00
parent 2f8e8fa587
commit f272389b99
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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)
#