diff options
| author | Ken Smith <kensmith@FreeBSD.org> | 2009-05-01 02:51:58 +0000 |
|---|---|---|
| committer | Ken Smith <kensmith@FreeBSD.org> | 2009-05-01 02:51:58 +0000 |
| commit | b205d83df7763ca1f099bce5ac12a05862a626c4 (patch) | |
| tree | f30d11bce592433d73cbb079c6db2d3428a52cf5 /gnu/usr.bin/diff3 | |
| parent | 54055718ff5134ddd61afc4c5f01440022040a06 (diff) | |
Copy releng/7.2 to release/7.2.0 for FreeBSD 7.2-RELEASE.release/7.2.0_cvs
Approved by: re (implicit)
This commit was manufactured to restore the state of the 7.2-RELEASE image.
Diffstat (limited to 'gnu/usr.bin/diff3')
| -rw-r--r-- | gnu/usr.bin/diff3/Makefile | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/diff3/diff3.c.diff | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile index 9fbb5dba6150..dc135bdc57cb 100644 --- a/gnu/usr.bin/diff3/Makefile +++ b/gnu/usr.bin/diff3/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/gnu/usr.bin/diff3/Makefile,v 1.8.8.1 2009/04/15 03:14:26 kensmith Exp $ DIFFSRC=${.CURDIR}/../../../contrib/diff/src .PATH: ${DIFFSRC} \ diff --git a/gnu/usr.bin/diff3/diff3.c.diff b/gnu/usr.bin/diff3/diff3.c.diff index 153d6e88c6d4..93494211faa1 100644 --- a/gnu/usr.bin/diff3/diff3.c.diff +++ b/gnu/usr.bin/diff3/diff3.c.diff @@ -1,4 +1,4 @@ -$FreeBSD$ +$FreeBSD: src/gnu/usr.bin/diff3/diff3.c.diff,v 1.1.10.1 2009/04/15 03:14:26 kensmith Exp $ --- diff3.c.orig 2004-04-12 15:44:35.000000000 +0800 +++ diff3.c 2007-06-15 14:49:23.903835977 +0800 @@ -230,7 +230,6 @@ |