AM
Size: a a a
AM
AK
AF
Б
<<<<<<< current versionА то руками слишком долго
# $FreeBSD: releng/11.1/etc/rc.subr 310010 2016-12-13 04:50:45Z dteske $
=======
# $FreeBSD: releng/12.0/libexec/rc/rc.subr 340348 2018-11-11 06:05:28Z dteske $
>>>>>>> 12.0-RELEASE
# find /var/db/freebsd-update/merge/new/ -type f | wc -l
350
ИБ
AF
<<<<<<< current versionА то руками слишком долго
# $FreeBSD: releng/11.1/etc/rc.subr 310010 2016-12-13 04:50:45Z dteske $
=======
# $FreeBSD: releng/12.0/libexec/rc/rc.subr 340348 2018-11-11 06:05:28Z dteske $
>>>>>>> 12.0-RELEASE
# find /var/db/freebsd-update/merge/new/ -type f | wc -l
350
Б
AF
Б
AF
N
-F If the files differ only by VCS Id ($FreeBSD) install the new
file.
Б
AF
Б
D
AF
MZ
SB
SB