socsvn commit: r237161 - in soc2012/jhagewood/diff3: . diff3
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Tue Jun 5 20:49:17 UTC 2012
Author: jhagewood
Date: Tue Jun 5 20:49:15 2012
New Revision: 237161
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237161
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 Tue Jun 5 20:14:03 2012 (r237160)
+++ soc2012/jhagewood/diff3/diff3/diff3prog.c Tue Jun 5 20:49:15 2012 (r237161)
@@ -767,7 +767,6 @@
printf ("%s", "\
-v --version Output version info.\n\
--help Output this help.\n\n");
- printf ("If a FILE is `-', read standard input.\n");
}
Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch Tue Jun 5 20:14:03 2012 (r237160)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch Tue Jun 5 20:49:15 2012 (r237161)
@@ -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-04 23:30:11.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c 2012-06-05 20:13:52.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c 2012-06-05 20:49:10.000000000 -0400
@@ -82,6 +82,9 @@
/* diff3 - 3-way differential file comparison */
@@ -143,7 +143,7 @@
__dead void
trouble(void)
{
-@@ -699,12 +744,38 @@ increase(void)
+@@ -699,12 +744,37 @@ increase(void)
}
@@ -171,7 +171,6 @@
+ printf ("%s", "\
+ -v --version Output version info.\n\
+ --help Output this help.\n\n");
-+ printf ("If a FILE is `-', read standard input.\n");
+
+}
+
More information about the svn-soc-all
mailing list