diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2008-01-15 15:46:22 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2008-01-15 15:46:22 +0000 |
| commit | 5cd221028ba5e7ada35a0dd196fb642b44f197d1 (patch) | |
| tree | d019bfe23aa5d3b5b6bb2c54e65e169e3c463b12 /gnu/usr.bin/diff3 | |
| parent | 665ce17da44f98ae193440703de789dedfb6a72c (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..e52bc397fb8b 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.7.8.1 2007/07/15 01:24:46 delphij 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..91c0cad8195c 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.2.1 2007/07/15 01:24:46 delphij 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 @@ |