From owner-svn-soc-all@FreeBSD.ORG  Wed Jun 13 03:07:10 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 38CB01065676
	for <svn-soc-all@FreeBSD.org>; Wed, 13 Jun 2012 03:07:08 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Wed, 13 Jun 2012 03:07:08 +0000
Date: Wed, 13 Jun 2012 03:07:08 +0000
From: jhagewood@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120613030708.38CB01065676@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r237578 - soc2012/jhagewood/diff3
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jun 2012 03:07:10 -0000

Author: jhagewood
Date: Wed Jun 13 03:07:07 2012
New Revision: 237578
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237578

Log:

Modified:
  soc2012/jhagewood/diff3/hagewood-diff3.patch

Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch	Wed Jun 13 03:04:35 2012	(r237577)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch	Wed Jun 13 03:07:07 2012	(r237578)
@@ -11,7 +11,7 @@
  .include <bsd.prog.mk>
 diff -rupN jhagewood/diff3/diff3-orig/diff3prog.c jhagewood/diff3/diff3/diff3prog.c
 --- jhagewood/diff3/diff3-orig/diff3prog.c	2012-06-10 03:31:05.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c	2012-06-13 03:04:14.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c	2012-06-13 03:04:38.000000000 -0400
 @@ -64,22 +64,31 @@
   *	@(#)diff3.c	8.1 (Berkeley) 6/6/93
   */
@@ -25,7 +25,7 @@
  #endif
 +#endif /* not lint */
 +#include <sys/cdefs.h>
-+__FBSDID("$FreeBSD: soc2012/jhagewood/diff3/diff3/diff3prog.c 237576 2012-06-13 03:00:08Z jhagewood $");
++__FBSDID("$FreeBSD: soc2012/jhagewood/diff3/diff3/diff3prog.c 237577 2012-06-13 03:04:35Z jhagewood $");
  
 +#include <ctype.h>
 +#include <err.h>