From owner-cvs-src@FreeBSD.ORG  Wed Dec 21 08:59:23 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 82B9D16A41F;
	Wed, 21 Dec 2005 08:59:23 +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 3426443D4C;
	Wed, 21 Dec 2005 08:59:23 +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 jBL8xNsX089260;
	Wed, 21 Dec 2005 08:59:23 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBL8xMjd089259;
	Wed, 21 Dec 2005 08:59:22 GMT (envelope-from dougb)
Message-Id: <200512210859.jBL8xMjd089259@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 21 Dec 2005 08:59:22 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Dec 2005 08:59:23 -0000

dougb       2005-12-21 08:59:22 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Change the default for deleting stale files from yes (which violates
  the general principle that mm should do nothing by default) to no.
  
  PR:             bin/85449
  Submitted by:   Kevin Oberman <oberman@es.net>
  
  Revision  Changes    Path
  1.52      +5 -5      src/usr.sbin/mergemaster/mergemaster.sh