From owner-cvs-src-old@FreeBSD.ORG  Wed Dec 30 23:26:40 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 84FE410656C0
	for <cvs-src-old@freebsd.org>; Wed, 30 Dec 2009 23:26:40 +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 595CF8FC12
	for <cvs-src-old@freebsd.org>; Wed, 30 Dec 2009 23:26:40 +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 nBUNQeIN057516
	for <cvs-src-old@freebsd.org>; Wed, 30 Dec 2009 23:26:40 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBUNQeWl057515
	for cvs-src-old@freebsd.org; Wed, 30 Dec 2009 23:26:40 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200912302326.nBUNQeWl057515@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:26:29 +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:26:40 -0000

dougb       2009-12-30 23:26:29 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 
  Log:
  SVN rev 201293 on 2009-12-30 23:26:29Z by dougb
  
  It's not necessary to include both Op and Fl for command line options
  included in the text, so use only the latter.
  
  Clarify that using -U doesn't make sense in combination with -a
  
  Revision  Changes    Path
  1.43      +11 -9     src/usr.sbin/mergemaster/mergemaster.8