Skip site navigation (1)Skip section navigation (2)
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>
In-Reply-To: <20180811101508.GA1152@albert.catwhisker.org>
References:  <0d409d71-5200-b475-34fc-16fa72861b13@gmail.com> <20180811084833.GK2118@home.opsec.eu> <20180811101508.GA1152@albert.catwhisker.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--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--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180811101644.GB1152>