https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=204549
--- Comment #15 from [email protected] --- A commit in branch stable/14 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=85f889aa9cdad831a68b42050d1adb47d4eb960d commit 85f889aa9cdad831a68b42050d1adb47d4eb960d Author: Graham Perrin <[email protected]> AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Ed Maste <[email protected]> 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(+) -- You are receiving this mail because: You are on the CC list for the bug.
