From owner-cvs-src-old@FreeBSD.ORG  Wed Mar 18 21:55:22 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 38F6010656CB
	for <cvs-src-old@freebsd.org>; Wed, 18 Mar 2009 21:55: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 20CDF8FC16
	for <cvs-src-old@freebsd.org>; Wed, 18 Mar 2009 21:55:22 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2ILtM76030370
	for <cvs-src-old@freebsd.org>; Wed, 18 Mar 2009 21:55:22 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2ILtLjg030369
	for cvs-src-old@freebsd.org; Wed, 18 Mar 2009 21:55:21 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200903182155.n2ILtLjg030369@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, 18 Mar 2009 21:55:08 +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, 18 Mar 2009 21:55:27 -0000

dougb       2009-03-18 21:55:08 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 
  Log:
  SVN rev 189994 on 2009-03-18 21:55:08Z by dougb
  
  1. Update for new -F option from r189992.
  2. Sort the command line options to match how they are displayed
  in usage()
  3. Change references to cvs to the more generic "version control system"
  and remove the .Xr for cvs
  4. Consistently use ".Op Fl" to refer to command line options in the text.
  5. Only use the apostrophe to indicate possession.
  6. Add FREEBSD_ID (-F) to the list of variables in the example rc,
  and change the DIFF_OPTIONS example to -Bb since -F now covers it.
  
  Revision  Changes    Path
  1.40      +42 -22    src/usr.sbin/mergemaster/mergemaster.8