From owner-freebsd-questions@freebsd.org  Tue Nov 15 18:11:10 2016
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 08D09C43192
 for <freebsd-questions@mailman.ysv.freebsd.org>;
 Tue, 15 Nov 2016 18:11:10 +0000 (UTC)
 (envelope-from chris@stankevitz.com)
Received: from mango.stankevitz.com (mango.stankevitz.com [208.79.93.194])
 by mx1.freebsd.org (Postfix) with ESMTP id F05C5F5
 for <freebsd-questions@freebsd.org>; Tue, 15 Nov 2016 18:11:09 +0000 (UTC)
 (envelope-from chris@stankevitz.com)
Received: from Chriss-MacBook-Pro.local (ip68-6-118-128.sb.sd.cox.net
 [68.6.118.128])
 by mango.stankevitz.com (Postfix) with ESMTPSA id A298B3C34D
 for <freebsd-questions@freebsd.org>; Tue, 15 Nov 2016 10:03:16 -0800 (PST)
To: FreeBSD Questions <freebsd-questions@freebsd.org>
From: Chris Stankevitz <chris@stankevitz.com>
Subject: Building world vs freebsd-update: merging files
Message-ID: <6d78a3d4-e1bd-a640-d395-6d809b0069f9@stankevitz.com>
Date: Tue, 15 Nov 2016 10:03:15 -0800
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:45.0)
 Gecko/20100101 Thunderbird/45.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
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: Tue, 15 Nov 2016 18:11:10 -0000

Hi,

When using mergemaster during buildworld/installworld, I am asked to 
merge many files.

When using freebsd-update, I am never asked to merge any files.

Why the discrepancy?

Thank you,

Chris