From owner-freebsd-questions Thu Feb 24 17: 6:35 2000 Delivered-To: freebsd-questions@freebsd.org Received: from dt051n0b.san.rr.com (dt051n0b.san.rr.com [204.210.32.11]) by hub.freebsd.org (Postfix) with ESMTP id 5A9D137BCDE for ; Thu, 24 Feb 2000 17:06:30 -0800 (PST) (envelope-from Doug@gorean.org) Received: from slave (doug@slave [10.0.0.1]) by dt051n0b.san.rr.com (8.9.3/8.9.3) with ESMTP id RAA55741; Thu, 24 Feb 2000 17:06:01 -0800 (PST) (envelope-from Doug@gorean.org) Date: Thu, 24 Feb 2000 17:06:01 -0800 (PST) From: Doug Barton X-Sender: doug@dt051n0b.san.rr.com To: lioux@linf.unb.br Cc: freebsd-questions@FreeBSD.ORG Subject: mergemaster problems? (Was: Re: XFree 3.3.6 authentication failed?) In-Reply-To: <200002241305.KAA09166@antares.linf.unb.br> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Thu, 24 Feb 100 lioux@linf.unb.br wrote: > > I think mergemaster would take care of this too, I dunno last time I used > > it it did more harm than good. mergemaster never does anything you don't tell it to. :) Seriously though, what problems did you have with it? Feel free to respond in private e-mail if you'd rather. Doug -- "Welcome to the desert of the real." - Laurence Fishburne as Morpheus, "The Matrix" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message