From owner-cvs-all@FreeBSD.ORG  Wed Dec 21 09:04:26 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
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 74FD016A41F;
	Wed, 21 Dec 2005 09:04:26 +0000 (GMT)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DD59843D79;
	Wed, 21 Dec 2005 09:04:24 +0000 (GMT)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBL94OtO089521;
	Wed, 21 Dec 2005 09:04:24 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBL94O5A089520;
	Wed, 21 Dec 2005 09:04:24 GMT (envelope-from dougb)
Message-Id: <200512210904.jBL94O5A089520@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 21 Dec 2005 09:04:24 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Cc: 
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Dec 2005 09:04:26 -0000

dougb       2005-12-21 09:04:24 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  MFC 1.52, do not delete stale /etc/rc.d files by default
  
  Revision  Changes    Path
  1.51.2.1  +5 -5      src/usr.sbin/mergemaster/mergemaster.sh