From owner-cvs-all  Mon Apr  8  3:30:51 2002
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 9874F37B41A; Mon,  8 Apr 2002 03:30:44 -0700 (PDT)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g38AUie59497;
	Mon, 8 Apr 2002 03:30:44 -0700 (PDT)
	(envelope-from dougb)
Message-Id: <200204081030.g38AUie59497@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 8 Apr 2002 03:30:44 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

dougb       2002/04/08 03:30:44 PDT

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Solve the problem of spuriously comparing files that were created
  in the ${TEMPROOT}/usr/obj directory by deleting them first.
  
  Revision  Changes    Path
  1.29      +3 -0      src/usr.sbin/mergemaster/mergemaster.sh

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message