From owner-cvs-all  Tue Jan 28 10:44:41 2003
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id DB7E637B401; Tue, 28 Jan 2003 10:44:40 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 824BD43E4A; Tue, 28 Jan 2003 10:44:40 -0800 (PST)
	(envelope-from dillon@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h0SIiebv086936;
	Tue, 28 Jan 2003 10:44:40 -0800 (PST)
	(envelope-from dillon@repoman.freebsd.org)
Received: (from dillon@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0SIie3G086935;
	Tue, 28 Jan 2003 10:44:40 -0800 (PST)
Message-Id: <200301281844.h0SIie3G086935@repoman.freebsd.org>
From: Matt Dillon <dillon@FreeBSD.org>
Date: Tue, 28 Jan 2003 10:44:40 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

dillon      2003/01/28 10:44:40 PST

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Backout last commit by request.
  
  Revision  Changes    Path
  1.40      +11 -44    src/usr.sbin/mergemaster/mergemaster.sh

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message