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
--XWOWbaMNXpFDWE00 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 04, 2003 at 04:50:37PM +0000, Ceri Davies wrote: >=20 > Was this behaviour from mergemaster intended ? >=20 >=20 > *** Displaying differences between ./etc/login.conf.db and installed ve= rsion: >=20 > Binary files /etc/login.conf.db and ./etc/login.conf.db differ >=20 > 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 >=20 > Default is to leave the temporary file to deal with by hand >=20 > How should I deal with this? [Leave it for later] d >=20 > *** Deleting ./etc/login.conf.db >=20 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, --=20 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 --XWOWbaMNXpFDWE00 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+ZSOFUkv4P6juNwoRAukGAJ9oYSAThF38QTEVhrsx0HKK+xg0TQCgjBBH BHGtX38v0NURF2yt7+AGhGw= =mQhJ -----END PGP SIGNATURE----- --XWOWbaMNXpFDWE00-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030304220701.GC73366>