From owner-cvs-src@FreeBSD.ORG  Mon Aug 25 01:27:42 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3E57316A4BF; Mon, 25 Aug 2003 01:27:42 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C3CDC43F75; Mon, 25 Aug 2003 01:27:41 -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 h7P8Rf0U038003;
	Mon, 25 Aug 2003 01:27:41 -0700 (PDT)
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7P8RfPk038002;
	Mon, 25 Aug 2003 01:27:41 -0700 (PDT)
Message-Id: <200308250827.h7P8RfPk038002@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 25 Aug 2003 01:27:41 -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.sh
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 25 Aug 2003 08:27:42 -0000

dougb       2003/08/25 01:27:41 PDT

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  MFC most of 1.4[467], the preserve replaced files option,
  and the fix for the build target
  
  Revision  Changes    Path
  1.6.2.18  +23 -4     src/usr.sbin/mergemaster/mergemaster.sh