Upgrading 11.0 to 11.1, /etc/mtree/BSD.usr.dist requires hand editting

Melissa Pilgrim melissa at bluerosetech.com
Wed Jul 26 23:08:55 UTC 2017

# freebsd-update -r 11.1-RELEASE upgrade
[metadata and patch fetching stuff happens]

Attempting to automatically merge changes in files... done.

The following file could not be merged automatically: 

It seems like these files should never need manual merging?

More information about the freebsd-questions mailing list