From owner-freebsd-stable Tue Mar 4 8:50:41 2003 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4EE437B401; Tue, 4 Mar 2003 08:50:39 -0800 (PST) Received: from shrike.submonkey.net (pc1-cdif2-5-cust38.cdif.cable.ntl.com [81.101.150.38]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B5A743F85; Tue, 4 Mar 2003 08:50:39 -0800 (PST) (envelope-from setantae@submonkey.net) Received: from setantae by shrike.submonkey.net with local (Exim 4.12) id 18qFcj-0001wt-00; Tue, 04 Mar 2003 16:50:37 +0000 Date: Tue, 4 Mar 2003 16:50:37 +0000 From: Ceri Davies To: ru@FreeBSD.org Cc: stable@FreeBSD.org Subject: r1.322 of src/Makefile.inc1 Message-ID: <20030304165037.GA7463@submonkey.net> Mail-Followup-To: Ceri Davies , ru@FreeBSD.org, stable@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.3i Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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