Date: Fri, 15 Jun 2012 18:23:02 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r237773 - in soc2012/jhagewood/diff3: . diff3 Message-ID: <20120615182302.509B51065677@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhagewood Date: Fri Jun 15 18:23:01 2012 New Revision: 237773 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237773 Log: Modified: soc2012/jhagewood/diff3/diff3/diff3prog.c soc2012/jhagewood/diff3/hagewood-diff3.patch Modified: soc2012/jhagewood/diff3/diff3/diff3prog.c ============================================================================== --- soc2012/jhagewood/diff3/diff3/diff3prog.c Fri Jun 15 17:31:15 2012 (r237772) +++ soc2012/jhagewood/diff3/diff3/diff3prog.c Fri Jun 15 18:23:01 2012 (r237773) @@ -224,7 +224,7 @@ oflag = eflag = 1; break; case 'v': - printf("OpenBSD diff3 1.11-FreeBSD"); + /* To do. */ exit(0); case 'x': eflag = 1; Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch ============================================================================== --- soc2012/jhagewood/diff3/hagewood-diff3.patch Fri Jun 15 17:31:15 2012 (r237772) +++ soc2012/jhagewood/diff3/hagewood-diff3.patch Fri Jun 15 18:23:01 2012 (r237773) @@ -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-14 05:32:21.000000000 -0400 -+++ jhagewood/diff3/diff3/diff3prog.c 2012-06-14 21:15:59.000000000 -0400 ++++ jhagewood/diff3/diff3/diff3prog.c 2012-06-15 18:22:42.000000000 -0400 @@ -64,19 +64,23 @@ * @(#)diff3.c 8.1 (Berkeley) 6/6/93 */ @@ -24,7 +24,7 @@ #endif +#endif /* not lint */ +#include <sys/cdefs.h> -+__FBSDID("$FreeBSD: soc2012/jhagewood/diff3/diff3/diff3prog.c 237727 2012-06-14 21:04:41Z jhagewood $"); ++__FBSDID("$FreeBSD: soc2012/jhagewood/diff3/diff3/diff3prog.c 237728 2012-06-14 21:17:35Z jhagewood $"); +#include <ctype.h> +#include <err.h> @@ -133,7 +133,7 @@ oflag = eflag = 1; break; + case 'v': -+ printf("OpenBSD diff3 1.11-FreeBSD"); ++ /* To do. */ + exit(0); case 'x': eflag = 1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120615182302.509B51065677>