summaryrefslogtreecommitdiff
path: root/UPDATING
diff options
context:
space:
mode:
Diffstat (limited to 'UPDATING')
-rw-r--r--UPDATING8
1 files changed, 4 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING
index 3d01ba60370a4..16fc1b17f5207 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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>