From owner-p4-projects@FreeBSD.ORG  Mon Feb  2 17:00:44 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 522931065674; Mon,  2 Feb 2009 17:00:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 07D3B106566B
	for <perforce@freebsd.org>; Mon,  2 Feb 2009 17:00:44 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CF63B8FC27
	for <perforce@freebsd.org>; Mon,  2 Feb 2009 17:00:43 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n12H0hMm038111
	for <perforce@freebsd.org>; Mon, 2 Feb 2009 17:00:43 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n12H0ho3038109
	for perforce@freebsd.org; Mon, 2 Feb 2009 17:00:43 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 2 Feb 2009 17:00:43 GMT
Message-Id: <200902021700.n12H0ho3038109@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 157042 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Feb 2009 17:00:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=157042

Change 157042 by trasz@trasz_victim7 on 2009/02/02 17:00:02

	Fix mismerge.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#5 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#5 (text+ko) ====

@@ -4,6 +4,8 @@
 # /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-posix.test
 #
 # WARNING: Creates files in unsafe way.
+#
+# $FreeBSD: head/tools/regression/acltools/tools-posix.test 185304 2008-11-25 18:29:33Z trasz $
 
 $ whoami
 > root