summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff3
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin/diff3')
-rw-r--r--gnu/usr.bin/diff3/Makefile2
-rw-r--r--gnu/usr.bin/diff3/diff3.c.diff2
2 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index 9fbb5dba6150a..b5239aaf656db 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 2007/06/15 07:09:33 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 153d6e88c6d40..21ad2871db53c 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 2007/06/15 07:09:33 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 @@