git: 85f889aa9cda - stable/14 - freebsd-update(8): Explain conflicts in /etc

The branch stable/14 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=85f889aa9cdad831a68b42050d1adb47d4eb960d

commit 85f889aa9cdad831a68b42050d1adb47d4eb960d
Author:     Graham Perrin <grahamperrin@gmail.com>
AuthorDate: 2023-08-19 14:52:18 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-10-21 15:46:41 +0000

    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
    
    (cherry picked from commit a8c1ffca7a594733a91c1513d0185be174d1115f)
---
 usr.sbin/freebsd-update/freebsd-update.8 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8
index 0d50ac8822de..1960b0ee95fe 100644
--- a/usr.sbin/freebsd-update/freebsd-update.8
+++ b/usr.sbin/freebsd-update/freebsd-update.8
@@ -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.