summaryrefslogtreecommitdiff
path: root/contrib/diff
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>2006-05-23 04:09:12 +0000
committercvs2svn <cvs2svn@FreeBSD.org>2006-05-23 04:09:12 +0000
commit8bf7295cd17b8415c40bde11aa8f5bbbd597e5d6 (patch)
tree81a52679e3e7f6958a04688cb683eaf21a140f5c /contrib/diff
parentde7242811fa5d383ece9325e6864e857b2997f20 (diff)
Diffstat (limited to 'contrib/diff')
-rw-r--r--contrib/diff/FREEBSD-upgrade2
-rw-r--r--contrib/diff/diff.c2
-rw-r--r--contrib/diff/diff.h2
-rw-r--r--contrib/diff/prepend_args.c2
-rw-r--r--contrib/diff/prepend_args.h2
-rw-r--r--contrib/diff/sdiff.c2
-rw-r--r--contrib/diff/util.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/contrib/diff/FREEBSD-upgrade b/contrib/diff/FREEBSD-upgrade
index 198c1d2371469..fdabac0a1c3b4 100644
--- a/contrib/diff/FREEBSD-upgrade
+++ b/contrib/diff/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/contrib/diff/FREEBSD-upgrade,v 1.2 2004/02/16 22:54:45 ache Exp $
Import of GNU diff 2.7
Original source available as ftp://prep.ai.mit.edu/pub/gnu/diffutils-2.7.tar.gz
diff --git a/contrib/diff/diff.c b/contrib/diff/diff.c
index 1f5f842d2e934..ec879c360e000 100644
--- a/contrib/diff/diff.c
+++ b/contrib/diff/diff.c
@@ -20,7 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* GNU DIFF was written by Mike Haertel, David Hayes,
Richard Stallman, Len Tower, and Paul Eggert. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/diff.c,v 1.4.8.1 2005/07/07 22:55:40 obrien Exp $ */
#define GDIFF_MAIN
#include "diff.h"
diff --git a/contrib/diff/diff.h b/contrib/diff/diff.h
index 9a92e0d9f1844..562f4e5477666 100644
--- a/contrib/diff/diff.h
+++ b/contrib/diff/diff.h
@@ -16,7 +16,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU DIFF; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/diff.h,v 1.3 2004/02/16 22:54:45 ache Exp $ */
#include "system.h"
#include <stdio.h>
diff --git a/contrib/diff/prepend_args.c b/contrib/diff/prepend_args.c
index 5dee55efccc1b..7bbeab5d40dac 100644
--- a/contrib/diff/prepend_args.c
+++ b/contrib/diff/prepend_args.c
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/prepend_args.c,v 1.2 2003/01/08 06:40:35 peter Exp $ */
#ifdef HAVE_CONFIG_H
diff --git a/contrib/diff/prepend_args.h b/contrib/diff/prepend_args.h
index 3f72cc2fd1120..a46de62ff1ebe 100644
--- a/contrib/diff/prepend_args.h
+++ b/contrib/diff/prepend_args.h
@@ -16,6 +16,6 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/prepend_args.h,v 1.1 1999/11/26 02:51:44 obrien Exp $ */
void prepend_default_options PARAMS ((char const *, int *, char ***));
diff --git a/contrib/diff/sdiff.c b/contrib/diff/sdiff.c
index 5b5759ededcdb..828f734d24cc4 100644
--- a/contrib/diff/sdiff.c
+++ b/contrib/diff/sdiff.c
@@ -20,7 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* GNU SDIFF was written by Thomas Lord. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/contrib/diff/sdiff.c,v 1.4 2002/01/29 17:40:45 nectar Exp $");
#include "system.h"
#include <stdio.h>
diff --git a/contrib/diff/util.c b/contrib/diff/util.c
index 35b28eae7f40e..8a0a715448907 100644
--- a/contrib/diff/util.c
+++ b/contrib/diff/util.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with GNU DIFF; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-/* $FreeBSD$ */
+/* $FreeBSD: src/contrib/diff/util.c,v 1.6 2003/11/03 12:41:27 harti Exp $ */
#include "diff.h"