From owner-freebsd-stable Wed Jun 13 10: 6:35 2001 Delivered-To: freebsd-stable@freebsd.org Received: from diarmadhi.mushhaven.net (diarmadhi.mushhaven.net [209.16.107.11]) by hub.freebsd.org (Postfix) with ESMTP id 6D71637B401 for ; Wed, 13 Jun 2001 10:06:33 -0700 (PDT) (envelope-from mistwolf@diarmadhi.mushhaven.net) Received: (from mistwolf@localhost) by diarmadhi.mushhaven.net (8.11.4/8.11.4) id f5DH6t121048 for freebsd-stable@FreeBSD.ORG; Wed, 13 Jun 2001 13:06:55 -0400 (EDT) (envelope-from mistwolf) Date: Wed, 13 Jun 2001 13:06:55 -0400 From: Jamie Norwood To: freebsd-stable@FreeBSD.ORG Subject: Re: Problems with mergemaster Message-ID: <20010613130655.A15641@mushhaven.net> References: <20010608134705.19635.qmail@web14701.mail.yahoo.com> <004001c0f030$36a0d3e0$0600020a@frontend> <20010612120958.G10614@tao.org.uk> <20010613102058.F5486@wantadilla.lemis.com> <045401c0f426$4a45d900$04c8c80a@enchantress.ab.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <045401c0f426$4a45d900$04c8c80a@enchantress.ab.ca>; from darren@enchantress.ca on Wed, Jun 13, 2001 at 10:31:25AM -0600 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 On Wed, Jun 13, 2001 at 10:31:25AM -0600, Darren Gamble wrote: > Good day, > > For each file, I get > > *** Problem installing ./foo , it will remain to merge by hand > I got this too, and ignored it. They merged fine for me, which would be why it ignored them subsequently. Jamie To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message