upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 01:30:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
diff3(1) usage
This commit is contained in:
Baptiste Daroussin 2016-09-18 14:48:28 +00:00
parent 5b71d8999c
commit 073dd71287
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr.sbin/freebsd-update/freebsd-update.sh
View file

@ -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} \