From owner-freebsd-stable@FreeBSD.ORG Sun Apr 20 15:22:15 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 93A6237B401 for ; Sun, 20 Apr 2003 15:22:15 -0700 (PDT) Received: from sccrmhc03.attbi.com (sccrmhc03.attbi.com [204.127.202.63]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0685E43FE0 for ; Sun, 20 Apr 2003 15:22:15 -0700 (PDT) (envelope-from DougB@freebsd.org) Received: from master.gorean.org (12-234-22-23.client.attbi.com[12.234.22.23]) by sccrmhc03.attbi.com (sccrmhc03) with SMTP id <200304202222140030055a8se>; Sun, 20 Apr 2003 22:22:14 +0000 Date: Sun, 20 Apr 2003 15:22:13 -0700 (PDT) From: Doug Barton To: Anton Zavrin In-Reply-To: <004901c30780$5347d250$0200a8c0@travel> Message-ID: <20030420151937.V631@znfgre.tberna.bet> References: <004901c30780$5347d250$0200a8c0@travel> 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: 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: Sun, 20 Apr 2003 22:22:15 -0000 On Sun, 20 Apr 2003, Anton Zavrin wrote: > I don't understand what is written in man pages about mergemaster, > that's the thing... Ok, can you give me an example of something that you don't understand? I tried to be quite thorough in the man page, but if people don't understand it, it's not doing its job. > But thanks for the tip anyway, that was a good one ;-) Glad to help. Doug -- This .signature sanitized for your protection