diff options
Diffstat (limited to 'usr.bin/cvs/diff3.c')
| -rw-r--r-- | usr.bin/cvs/diff3.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index 91290eaaaa1..3a9339aaf54 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.50 2009/06/07 08:39:13 ray Exp $ */ +/* $OpenBSD: diff3.c,v 1.51 2009/10/27 23:59:37 deraadt Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -64,17 +64,6 @@ * @(#)diff3.c 8.1 (Berkeley) 6/6/93 */ -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1991, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static const char rcsid[] = - "$OpenBSD: diff3.c,v 1.50 2009/06/07 08:39:13 ray Exp $"; -#endif /* not lint */ - #include <ctype.h> #include <errno.h> #include <fcntl.h> |