From owner-freebsd-current@freebsd.org  Sat Aug 11 10:16:47 2018
Return-Path: <owner-freebsd-current@freebsd.org>
Delivered-To: freebsd-current@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4ACEA1065A24
 for <freebsd-current@mailman.ysv.freebsd.org>;
 Sat, 11 Aug 2018 10:16:47 +0000 (UTC)
 (envelope-from david@catwhisker.org)
Received: from mx.catwhisker.org (mx.catwhisker.org [198.144.209.73])
 (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 A97A374C25;
 Sat, 11 Aug 2018 10:16:46 +0000 (UTC)
 (envelope-from david@catwhisker.org)
Received: from albert.catwhisker.org (localhost [127.0.0.1])
 by albert.catwhisker.org (8.15.2/8.15.2) with ESMTP id w7BAGjJi073133;
 Sat, 11 Aug 2018 10:16:45 GMT
 (envelope-from david@albert.catwhisker.org)
Received: (from david@localhost)
 by albert.catwhisker.org (8.15.2/8.15.2/Submit) id w7BAGjpR073132;
 Sat, 11 Aug 2018 03:16:45 -0700 (PDT) (envelope-from david)
Date: Sat, 11 Aug 2018 03:16:44 -0700
From: David Wolfskill <david@catwhisker.org>
To: Graham Perrin <grahamperrin@gmail.com>, freebsd-current@freebsd.org,
 Kurt Jaeger <pi@freebsd.org>
Subject: Re: Unexpected results with 'mergemaster -Ui'
Message-ID: <20180811101644.GB1152@albert.catwhisker.org>
Mail-Followup-To: David Wolfskill <david@catwhisker.org>,
 Graham Perrin <grahamperrin@gmail.com>, freebsd-current@freebsd.org,
 Kurt Jaeger <pi@freebsd.org>
References: <0d409d71-5200-b475-34fc-16fa72861b13@gmail.com>
 <20180811084833.GK2118@home.opsec.eu>
 <20180811101508.GA1152@albert.catwhisker.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
 protocol="application/pgp-signature"; boundary="JraWtMLRUgwj3Q3c"
Content-Disposition: inline
In-Reply-To: <20180811101508.GA1152@albert.catwhisker.org>
User-Agent: Mutt/1.10.1 (2018-07-13)
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Aug 2018 10:16:47 -0000


--JraWtMLRUgwj3Q3c
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Of course, I then saw that you *had* an "ntpd" entry in your side
anyway.  Sorry for the noise.

Peace,
david
--=20
David H. Wolfskill				david@catwhisker.org
Trump is gaslighting us: https://www.bbc.com/news/world-us-canada-44959300

See http://www.catwhisker.org/~david/publickey.gpg for my public key.

--JraWtMLRUgwj3Q3c
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQGTBAEBCgB9FiEEzLfO+ReoAfQwZNd7FTnMQKBJ7hcFAltut4xfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEND
QjdDRUY5MTdBODAxRjQzMDY0RDc3QjE1MzlDQzQwQTA0OUVFMTcACgkQFTnMQKBJ
7heO5Qf+KL0Rl8mZ/oT6NaTlpsy9HJcfSQP4lyiH01wwkW88kPxSbtdLV3h6+MTR
4djllTkZavw2SNZWYtMHQ08na8LfaFZIei/KmfhvZBxsfVnDWUh7BC99KfYhF//J
VN3vHCC15s3F26HQ9eAUElTzUeFIR964KhKggy8V5Q0dbUhhbDdS0iqXUG0WSv7g
zSw70tX20svTafSAq1apiyo8nWdhcAX+EBj0jUoKGWqxkLK+0m8Nn74hFvfP3g1U
NcWfUcxNLM0lnRoYUAqvA2Z0pjKUh60AVbdK9EoHlfr9OL3sAl7276hu2/ZgVPEe
NAdO61IeBiqoQn4JqxeZIGKO+vuZhg==
=Vm5S
-----END PGP SIGNATURE-----

--JraWtMLRUgwj3Q3c--