From owner-cvs-all@FreeBSD.ORG  Tue Jan  6 10:06:42 2004
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 4754116A4CE; Tue,  6 Jan 2004 10:06:42 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7F40A43D64; Tue,  6 Jan 2004 10:06:38 -0800 (PST)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i06I6c0B060007;
	Tue, 6 Jan 2004 10:06:38 -0800 (PST)
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i06I6cOr060006;
	Tue, 6 Jan 2004 10:06:38 -0800 (PST)
	(envelope-from dougb)
Message-Id: <200401061806.i06I6cOr060006@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 6 Jan 2004 10:06:38 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5_2
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
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: Tue, 06 Jan 2004 18:06:42 -0000

dougb       2004/01/06 10:06:38 PST

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5_2)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Commit the fix from 1.49 which prevents false positives in the
  -p (pre-world) case
  
  Approved by:    re (scottl)
  
  Revision  Changes    Path
  1.47.2.2  +4 -5      src/usr.sbin/mergemaster/mergemaster.sh