HomeFreeBSD

freebsd-update(8): Explain conflicts in /etc

Description

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)
(cherry picked from commit 85f889aa9cdad831a68b42050d1adb47d4eb960d)

Details

Provenance
grahamperrinAuthored on Aug 19 2023, 2:52 PM
emasteCommitted on Mon, Oct 21, 3:48 PM
Parents
rGfabc189f2adf: igc: txrx function prototype cleanup
Branches
Unknown
Tags
Unknown