From owner-cvs-all@FreeBSD.ORG  Mon Dec 24 06:33:33 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3E9D716A418;
	Mon, 24 Dec 2007 06:33:33 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F136413C465;
	Mon, 24 Dec 2007 06:33:32 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBO6XWih024009;
	Mon, 24 Dec 2007 06:33:32 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBO6XWL2024006;
	Mon, 24 Dec 2007 06:33:32 GMT (envelope-from dougb)
Message-Id: <200712240633.lBO6XWL2024006@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 24 Dec 2007 06:33:32 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_7_0
Cc: 
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
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, 24 Dec 2007 06:33:33 -0000

dougb       2007-12-24 06:33:22 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7_0)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  MFC version 1.55, safety belt for the (unlikely) disappearance of
  the temproot before a -r run.
  
  Approved by:    re (kensmith)
  
  Revision  Changes    Path
  1.54.4.1  +7 -0      src/usr.sbin/mergemaster/mergemaster.sh