Unexpected results with 'mergemaster -Ui'

[David Wolfskill]

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

Peace,
david
-- 
David H. Wolfskill				david at 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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-current/attachments/20180811/f5fd95dc/attachment.sig>