Date: Tue, 4 Mar 2003 16:50:37 +0000 From: Ceri Davies <setantae@submonkey.net> To: ru@FreeBSD.org Cc: stable@FreeBSD.org Subject: r1.322 of src/Makefile.inc1 Message-ID: <20030304165037.GA7463@submonkey.net>
next in thread | raw e-mail | index | archive | help
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 Ceri -- 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?20030304165037.GA7463>