From owner-cvs-all  Wed May 30  1:50:15 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 2232637B424; Wed, 30 May 2001 01:50:11 -0700 (PDT)
	(envelope-from dougb@FreeBSD.org)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f4U8oBA17352;
	Wed, 30 May 2001 01:50:11 -0700 (PDT)
	(envelope-from dougb)
Message-Id: <200105300850.f4U8oBA17352@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 30 May 2001 01:50:11 -0700 (PDT)
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?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

dougb       2001/05/30 01:50:11 PDT

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Add the last of the compatibility mods from openbsd. Neatly, the
  "install && rm" change fits in with the new FreeBSD default of
  copy instead of move for install. Changing the order of the deletion
  of the spurious password files doesn't affect FreeBSD functionality,
  but it's done in such a way as not to matter.
  
  Obtained from:	Christian Weisgerber <naddy@mips.inka.de>
  
  Revision  Changes    Path
  1.23      +15 -10    src/usr.sbin/mergemaster/mergemaster.sh


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