From owner-freebsd-stable@FreeBSD.ORG Wed Apr 30 19:42:25 2003 Return-Path: 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 00B6337B401 for ; Wed, 30 Apr 2003 19:42:25 -0700 (PDT) Received: from sccrmhc01.attbi.com (sccrmhc01.attbi.com [204.127.202.61]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5ECF543FA3 for ; Wed, 30 Apr 2003 19:42:24 -0700 (PDT) (envelope-from DougB@freebsd.org) Received: from master.dougb.net (12-234-22-23.client.attbi.com[12.234.22.23]) by sccrmhc01.attbi.com (sccrmhc01) with SMTP id <2003050102421900100nljh7e>; Thu, 1 May 2003 02:42:19 +0000 Date: Wed, 30 Apr 2003 19:42:18 -0700 (PDT) From: Doug Barton To: Lamont Granquist In-Reply-To: <20030430190355.D5470@coredump.scriptkiddie.org> Message-ID: <20030430194200.X5121@znfgre.qbhto.arg> References: <004901c30780$5347d250$0200a8c0@travel> <20030420151937.V631@znfgre.tberna.bet> <20030430190355.D5470@coredump.scriptkiddie.org> Organization: http://www.FreeBSD.org/ X-message-flag: Outlook -- Not just for spreading viruses anymore! MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Anton Zavrin cc: freebsd-stable@freebsd.org Subject: RE: mergemaster tips X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 May 2003 02:42:25 -0000 You should really check the archives. All these topics have been covered before. Doug -- This .signature sanitized for your protection