From owner-cvs-all@FreeBSD.ORG  Thu May  1 23:28:31 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 903D237B401; Thu,  1 May 2003 23:28:31 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2CDA443F93; Thu,  1 May 2003 23:28:31 -0700 (PDT)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h426SV0U044695;
	Thu, 1 May 2003 23:28:31 -0700 (PDT)
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h426SUw3044694;
	Thu, 1 May 2003 23:28:30 -0700 (PDT)
Message-Id: <200305020628.h426SUw3044694@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 1 May 2003 23:28:30 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 May 2003 06:28:32 -0000

dougb       2003/05/01 23:28:30 PDT

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 
  Log:
  * Document the -P option
  
  * Add a paragraph suggesting that the merge option be used only for
  files that users have modified. People have been using this option
  for all files that are different, causing unecessary confusion.
  
  Revision  Changes    Path
  1.28      +17 -1     src/usr.sbin/mergemaster/mergemaster.8