In preparation for removal of GNU rcs, replace merge(1) usage with direct

diff3(1) usage
2016-09-18 14:48:28 +00:00 · 2016-09-18 14:48:28 +00:00 · 43ffcb48b5
commit 43ffcb48b5
parent a21d9f2b30
1 changed files with 1 additions and 1 deletions
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@ -2380,7 +2380,7 @@ upgrade_merge () {
 				cp merge/old/${F} merge/new/${F}
 				;;
 			*)
-				if ! merge -p -L "current version"	\
+				if ! diff3 -E -m -L "current version"	\
 				    -L "${OLDRELNUM}" -L "${RELNUM}"	\
 				    merge/old/${F}			\
 				    merge/${OLDRELNUM}/${F}		\