Date: Sat, 11 Aug 2018 10:48:33 +0200 From: Kurt Jaeger <pi@freebsd.org> To: Graham Perrin <grahamperrin@gmail.com> Cc: freebsd-current@freebsd.org Subject: Re: Unexpected results with 'mergemaster -Ui' Message-ID: <20180811084833.GK2118@home.opsec.eu> In-Reply-To: <0d409d71-5200-b475-34fc-16fa72861b13@gmail.com> References: <0d409d71-5200-b475-34fc-16fa72861b13@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi! > <https://pastebin.com/m7q8dpWB>; line 133 onwards, for example. > > I never before found any potential change to > /etc/group > > Please, is it unusual? No, it is normal, that happens if you have local changes. I suggest you discard the incoming /etc/group and go with your current version and the local changes. -- pi@FreeBSD.org +49 171 3101372 2 years to go !
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180811084833.GK2118>