From owner-cvs-all Sun Jun 3 21:11:44 2001 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8032537B401; Sun, 3 Jun 2001 21:11:41 -0700 (PDT) (envelope-from dougb@FreeBSD.org) Received: (from dougb@localhost) by freefall.freebsd.org (8.11.3/8.11.3) id f544BfJ30258; Sun, 3 Jun 2001 21:11:41 -0700 (PDT) (envelope-from dougb) Message-Id: <200106040411.f544BfJ30258@freefall.freebsd.org> From: Doug Barton Date: Sun, 3 Jun 2001 21:11:41 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh X-FreeBSD-CVS-Branch: RELENG_4 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 dougb 2001/06/03 21:11:41 PDT Modified files: (Branch: RELENG_4) usr.sbin/mergemaster mergemaster.sh Log: MFC 1.19-23, cleanups and clarifications, along with some OpenBSD compatibility changes. No new functionality. Revision Changes Path 1.6.2.7 +100 -47 src/usr.sbin/mergemaster/mergemaster.sh To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message