From owner-cvs-src@FreeBSD.ORG  Wed Jun 11 18:54:22 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 598451065679;
	Wed, 11 Jun 2008 18:54:22 +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 19E298FC26;
	Wed, 11 Jun 2008 18:54:22 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5BIsL3G069133;
	Wed, 11 Jun 2008 18:54:21 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5BIsL6W069132;
	Wed, 11 Jun 2008 18:54:21 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200806111854.m5BIsL6W069132@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, 11 Jun 2008 18:54:06 +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.8
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, 11 Jun 2008 18:54:22 -0000

dougb       2008-06-11 18:54:06 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 
  Log:
  SVN rev 179725 on 2008-06-11 18:54:06Z by dougb
  
  Document the AUTO_UPGRADE (-U) knob for .mergemasterrc
  
  Submitted by:   mezz
  No Cookie For:  gordon  :)
  
  Revision  Changes    Path
  1.37      +3 -0      src/usr.sbin/mergemaster/mergemaster.8