From owner-freebsd-arch Sat Jan 6 19:17: 2 2001 Delivered-To: freebsd-arch@freebsd.org Received: from puck.firepipe.net (mcut-b-167.resnet.purdue.edu [128.211.209.167]) by hub.freebsd.org (Postfix) with ESMTP id C77F537B69D for ; Sat, 6 Jan 2001 19:16:20 -0800 (PST) Received: by puck.firepipe.net (Postfix, from userid 1000) id 205571B6E; Sat, 6 Jan 2001 22:16:20 -0500 (EST) Date: Sat, 6 Jan 2001 22:16:20 -0500 From: Will Andrews To: arch@FreeBSD.ORG Subject: Re: Is /etc/mergemaster.conf desirable? Message-ID: <20010106221620.I1611@puck.firepipe.net> Reply-To: Will Andrews Mail-Followup-To: Will Andrews , arch@FreeBSD.ORG References: <3A57AA03.4CEB49E7@gorean.org> <20010106211024.H1611@puck.firepipe.net> <20010106191338.A59025@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20010106191338.A59025@dragon.nuxi.com>; from TrimYourCc@NUXI.com on Sat, Jan 06, 2001 at 07:13:38PM -0800 X-Operating-System: FreeBSD 4.2-STABLE i386 Sender: owner-freebsd-arch@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Sat, Jan 06, 2001 at 07:13:38PM -0800, David O'Brien wrote: > I argue that ~/.mergemaster is wrong vs. /etc/mergemaster.conf, > mergemaster works on the local machine, not a per user basis. It would > make more sense to have .ppp.conf than /etc/ppp/ppp.conf which is what we > have. We also have /etc/ssh/ssh_config and ~/.ssh/config... You're right. But I don't think it belongs in /etc.. unless mergemaster ignores the file automatically. A technicality, I suppose.. -- wca To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message