socsvn commit: r237578 - soc2012/jhagewood/diff3
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Wed Jun 13 03:07:10 UTC 2012
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>
More information about the svn-soc-all
mailing list