From owner-svn-src-user@FreeBSD.ORG  Wed Sep 12 13:39:58 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DF826106566B;
	Wed, 12 Sep 2012 13:39:58 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B29328FC08;
	Wed, 12 Sep 2012 13:39:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8CDdwtu078428;
	Wed, 12 Sep 2012 13:39:58 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8CDdw4k078426;
	Wed, 12 Sep 2012 13:39:58 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201209121339.q8CDdw4k078426@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Wed, 12 Sep 2012 13:39:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240398 - user/des/fmerge
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Sep 2012 13:39:59 -0000

Author: des
Date: Wed Sep 12 13:39:58 2012
New Revision: 240398
URL: http://svn.freebsd.org/changeset/base/240398

Log:
  Revert accidental commit

Modified:
  user/des/fmerge/Makefile

Modified: user/des/fmerge/Makefile
==============================================================================
--- user/des/fmerge/Makefile	Wed Sep 12 13:38:02 2012	(r240397)
+++ user/des/fmerge/Makefile	Wed Sep 12 13:39:58 2012	(r240398)
@@ -2,4 +2,5 @@
 
 SCRIPTS = fmerge.pl
 
+.include "${.CURDIR}/../Makefile.inc"
 .include <bsd.prog.mk>