From owner-cvs-all@FreeBSD.ORG  Mon Aug 25 01:24:36 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 6A90416A4BF; Mon, 25 Aug 2003 01:24:36 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 061DD43FE9; Mon, 25 Aug 2003 01:24:36 -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 h7P8OZ0U037865;
	Mon, 25 Aug 2003 01:24:35 -0700 (PDT)
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7P8OZRZ037864;
	Mon, 25 Aug 2003 01:24:35 -0700 (PDT)
Message-Id: <200308250824.h7P8OZRZ037864@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 25 Aug 2003 01:24:35 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_4
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: Mon, 25 Aug 2003 08:24:36 -0000

dougb       2003/08/25 01:24:35 PDT

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.8 
  Log:
  MFC 1.28, docs for the -P (preserve replaced files) option,
  and why not to merge files you didn't modify
  
  Revision  Changes    Path
  1.5.2.13  +17 -1     src/usr.sbin/mergemaster/mergemaster.8