From owner-cvs-all  Mon Jun 10  0:16:46 2002
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 B084837B403; Mon, 10 Jun 2002 00:16:42 -0700 (PDT)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g5A7GgT27653;
	Mon, 10 Jun 2002 00:16:42 -0700 (PDT)
	(envelope-from dougb)
Message-Id: <200206100716.g5A7GgT27653@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 10 Jun 2002 00:16:42 -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@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

dougb       2002/06/10 00:16:42 PDT

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Go back to taking the user's umask into account. Thanks to Alfred for
  hatching the idea of using dc, and Giorgos (keramida) for incubating it.
  
  This also reverses most of the previous commit which took out or
  modified the text about umask stuff.
  
  Revision  Changes    Path
  1.33      +31 -23    src/usr.sbin/mergemaster/mergemaster.sh

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