since -F is safe, and an update from 10-HEAD to 10-STABLE is sooo bloody

anoying w/o it..  recommend people use -F too...
This commit is contained in:
John-Mark Gurney 2014-02-28 19:51:47 +00:00
parent 4570e665b4
commit 059400366e

View File

@ -1953,9 +1953,9 @@ COMMON ITEMS:
make kernel KERNCONF=YOUR_KERNEL_HERE
[1]
<reboot in single user> [3]
mergemaster -p [5]
mergemaster -Fp [5]
make installworld
mergemaster -i [4]
mergemaster -Fi [4]
make delete-old [6]
<reboot>
@ -1990,9 +1990,9 @@ COMMON ITEMS:
make kernel KERNCONF=YOUR_KERNEL_HERE [8]
[1]
<reboot in single user> [3]
mergemaster -p [5]
mergemaster -Fp [5]
make installworld
mergemaster -i [4]
mergemaster -Fi [4]
make delete-old [6]
<reboot>