From owner-cvs-src-old@FreeBSD.ORG  Wed Dec 30 23:16:34 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 87FA8106568D
	for <cvs-src-old@freebsd.org>; Wed, 30 Dec 2009 23:16:34 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5C3F28FC23
	for <cvs-src-old@freebsd.org>; Wed, 30 Dec 2009 23:16:34 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBUNGYHV056573
	for <cvs-src-old@freebsd.org>; Wed, 30 Dec 2009 23:16:34 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBUNGYaB056572
	for cvs-src-old@freebsd.org; Wed, 30 Dec 2009 23:16:34 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200912302316.nBUNGYaB056572@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	dougb@repoman.freebsd.org using -f
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 30 Dec 2009 23:16:14 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Dec 2009 23:16:34 -0000

dougb       2009-12-30 23:16:14 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 
  Log:
  SVN rev 201292 on 2009-12-30 23:16:14Z by dougb
  
  Document the DELETE_STALE_RC_FILES option introduced in r201291. This is
  an "rc file only" option by design.
  
  While I'm here, update the comments in the example rc file to indicate
  which command line options they relate to, and correct the defaults
  for a couple of options.
  
  Revision  Changes    Path
  1.42      +19 -16    src/usr.sbin/mergemaster/mergemaster.8