diff options
| author | Ken Smith <kensmith@FreeBSD.org> | 2011-02-16 16:18:46 +0000 |
|---|---|---|
| committer | Ken Smith <kensmith@FreeBSD.org> | 2011-02-16 16:18:46 +0000 |
| commit | dec99dafe5763ba1db6950342aa80a634169c083 (patch) | |
| tree | 1bd9f5a688ac947b00e690c3c69ccb8df203768d /gnu/usr.bin/diff3 | |
| parent | 045f17e533c0209bbcddcccbbb0192d61ffd6c9c (diff) | |
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..a4f70424c092 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.10.1.6.1 2010/12/21 17:09:25 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..4bcc82792bcf 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.12.1.6.1 2010/12/21 17:09:25 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 @@ |