From 059400366e7d0ef65fca54397a69daecb7190967 Mon Sep 17 00:00:00 2001
From: John-Mark Gurney <jmg@FreeBSD.org>
Date: Fri, 28 Feb 2014 19:51:47 +0000
Subject: [PATCH] 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...

---
 UPDATING | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UPDATING b/UPDATING
index 3d01ba60370..16fc1b17f52 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>