Date: Wed, 5 Mar 2003 00:07:01 +0200 From: Ruslan Ermilov <ru@freebsd.org> To: Ceri Davies <setantae@submonkey.net> Cc: Doug Barton <dougb@freebsd.org>, stable@freebsd.org Subject: Re: r1.322 of src/Makefile.inc1 Message-ID: <20030304220701.GC73366@sunbay.com> In-Reply-To: <20030304165037.GA7463@submonkey.net> References: <20030304165037.GA7463@submonkey.net>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Tue, Mar 04, 2003 at 04:50:37PM +0000, Ceri Davies wrote: > > Was this behaviour from mergemaster intended ? > > > *** Displaying differences between ./etc/login.conf.db and installed version: > > Binary files /etc/login.conf.db and ./etc/login.conf.db differ > > Use 'd' to delete the temporary ./etc/login.conf.db > Use 'i' to install the temporary ./etc/login.conf.db > Use 'm' to merge the temporary and installed versions > Use 'v' to view the diff results again > > Default is to leave the temporary file to deal with by hand > > How should I deal with this? [Leave it for later] d > > *** Deleting ./etc/login.conf.db > Sorry, I don't use mergemaster(8) so I can't say. Doug was all for this change, so he may be of some help here. Cheers, -- Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+ZSOFUkv4P6juNwoRAukGAJ9oYSAThF38QTEVhrsx0HKK+xg0TQCgjBBH BHGtX38v0NURF2yt7+AGhGw= =mQhJ -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030304220701.GC73366>