From owner-freebsd-arch Sat Jan 6 21:10:51 2001 Delivered-To: freebsd-arch@freebsd.org Received: from relay.nuxi.com (nuxi.cs.ucdavis.edu [169.237.7.38]) by hub.freebsd.org (Postfix) with ESMTP id 93CB637B402 for ; Sat, 6 Jan 2001 21:10:06 -0800 (PST) Received: from dragon.nuxi.com (Ipitythefoolthattrustsident@trang.nuxi.com [209.152.133.57]) by relay.nuxi.com (8.9.3/8.9.3) with ESMTP id VAA13519; Sat, 6 Jan 2001 21:10:05 -0800 (PST) (envelope-from obrien@NUXI.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.11.1/8.11.1) id f075A4O59648; Sat, 6 Jan 2001 21:10:04 -0800 (PST) (envelope-from obrien) Date: Sat, 6 Jan 2001 21:10:04 -0800 From: "David O'Brien" To: Will Andrews Cc: arch@FreeBSD.ORG Subject: Re: Is /etc/mergemaster.conf desirable? Message-ID: <20010106211004.A59625@dragon.nuxi.com> Reply-To: arch@FreeBSD.ORG References: <3A57AA03.4CEB49E7@gorean.org> <20010106211024.H1611@puck.firepipe.net> <20010106191338.A59025@dragon.nuxi.com> <20010106221620.I1611@puck.firepipe.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20010106221620.I1611@puck.firepipe.net>; from will@physics.purdue.edu on Sat, Jan 06, 2001 at 10:16:20PM -0500 X-Operating-System: FreeBSD 5.0-CURRENT Organization: The NUXI BSD group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Sender: owner-freebsd-arch@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Sat, Jan 06, 2001 at 10:16:20PM -0500, Will Andrews wrote: > You're right. But I don't think it belongs in /etc.. unless mergemaster > ignores the file automatically. A technicality, I suppose.. If there isn't a /usr/src/etc/mergemaster.conf it will. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message