From owner-cvs-all Tue May 28 1:26:43 2002 Delivered-To: cvs-all@freebsd.org Received: from 12-234-22-238.client.attbi.com (12-234-90-219.client.attbi.com [12.234.90.219]) by hub.freebsd.org (Postfix) with ESMTP id 85F3237B401; Tue, 28 May 2002 01:26:39 -0700 (PDT) Received: from master.gorean.org (master.gorean.org [10.0.0.2]) by 12-234-22-238.client.attbi.com (8.12.3/8.12.3) with ESMTP id g4S8QdlX006854; Tue, 28 May 2002 01:26:39 -0700 (PDT) (envelope-from DougB@FreeBSD.org) Received: from localhost (doug@localhost) by master.gorean.org (8.12.3/8.12.3/Submit) with ESMTP id g4S8QdBn099917; Tue, 28 May 2002 01:26:39 -0700 (PDT) Date: Tue, 28 May 2002 01:26:39 -0700 (PDT) From: Doug Barton To: cvs-committers@FreeBSD.org, Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.8 In-Reply-To: <200205280730.g4S7UKN43005@freefall.freebsd.org> Message-ID: <20020528012509.U96373-100000@master.gorean.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, 28 May 2002, Doug Barton wrote: > dougb 2002/05/28 00:30:20 PDT > > Modified files: (Branch: RELENG_4) > usr.sbin/mergemaster mergemaster.8 > Log: > MFC 1.22 > > Revision Changes Path > 1.5.2.10 +4 -1 src/usr.sbin/mergemaster/mergemaster.8 > > http://www.FreeBSD.org/cgi/cvsweb.cgi/src/usr.sbin/mergemaster/mergemaster.8.diff?&r1=1.5.2.9&r2=1.5.2.10&f=h In case anyone is keeping score at home, this was also approved by re@, but I accidentally did 'cvs ci -m "blah"' instead of using the template, mea culpa. -- "We have known freedom's price. We have shown freedom's power. And in this great conflict, ... we will see freedom's victory." - George W. Bush, President of the United States State of the Union, January 28, 2002 Do YOU Yahoo!? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message