mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
freebsd-update(8): Explain conflicts in /etc
Unlike etcupdate(8), freebsd-update only prints the files with conflicts. It doesn't merge. PR: 204549 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/826
This commit is contained in:
parent
d854370fa8
commit
a8c1ffca7a
|
@ -264,3 +264,12 @@ required.
|
|||
.Xr nextboot 8
|
||||
.Sh AUTHORS
|
||||
.An Colin Percival Aq Mt cperciva@FreeBSD.org
|
||||
.Sh BUGS
|
||||
In patch level situations – for example, 13.2-RELEASE-p1 up to 13.2-RELEASE-p2: if any previous modification to a file in
|
||||
.Pa /etc/
|
||||
will conflict with an available update, then
|
||||
.Nm
|
||||
will make no attempt to merge.
|
||||
Instead:
|
||||
.Nm
|
||||
will print a list of affected locally-modified files.
|
||||
|
|
Loading…
Reference in a new issue