From owner-freebsd-questions@freebsd.org  Wed Jul 26 23:08:55 2017
Return-Path: <owner-freebsd-questions@freebsd.org>
Delivered-To: freebsd-questions@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1D80DB2EEF
 for <freebsd-questions@mailman.ysv.freebsd.org>;
 Wed, 26 Jul 2017 23:08:55 +0000 (UTC)
 (envelope-from melissa@bluerosetech.com)
Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org
 [IPv6:2001:1900:2254:206a::50:5])
 by mx1.freebsd.org (Postfix) with ESMTP id BCFE57F703
 for <freebsd-questions@freebsd.org>; Wed, 26 Jul 2017 23:08:55 +0000 (UTC)
 (envelope-from melissa@bluerosetech.com)
Received: by mailman.ysv.freebsd.org (Postfix)
 id B9183DB2EEE; Wed, 26 Jul 2017 23:08:55 +0000 (UTC)
Delivered-To: questions@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6D88DB2EED
 for <questions@mailman.ysv.freebsd.org>; Wed, 26 Jul 2017 23:08:55 +0000 (UTC)
 (envelope-from melissa@bluerosetech.com)
Received: from echo.brtsvcs.net (echo.brtsvcs.net [IPv6:2607:f740:c::4ae])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A07F47F702
 for <questions@freebsd.org>; Wed, 26 Jul 2017 23:08:55 +0000 (UTC)
 (envelope-from melissa@bluerosetech.com)
Received: from chombo.houseloki.net (c-73-240-250-185.hsd1.or.comcast.net
 [73.240.250.185])
 by echo.brtsvcs.net (Postfix) with ESMTPS id 933F55000C
 for <questions@freebsd.org>; Wed, 26 Jul 2017 23:08:54 +0000 (UTC)
Received: from [IPv6:fe80::7102:4df8:1f13:5c55] (unknown
 [IPv6:fe80::7102:4df8:1f13:5c55])
 by chombo.houseloki.net (Postfix) with ESMTPSA id 409F5B4E
 for <questions@freebsd.org>; Wed, 26 Jul 2017 16:08:53 -0700 (PDT)
To: questions@freebsd.org
From: Melissa Pilgrim <melissa@bluerosetech.com>
Subject: Upgrading 11.0 to 11.1, /etc/mtree/BSD.usr.dist requires hand editting
Message-ID: <8d8ac6c7-df53-84f4-9c52-b6688242e2e6@bluerosetech.com>
Date: Wed, 26 Jul 2017 16:08:53 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101
 Thunderbird/52.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions/>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Jul 2017 23:08:55 -0000

# 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: 
/etc/mtree/BSD.usr.dist


It seems like these files should never need manual merging?