aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff
diff options
context:
space:
mode:
authorCem Keylan <cem@ckyln.com>2021-07-14 14:39:31 +0300
committerCem Keylan <cem@ckyln.com>2021-07-14 14:39:31 +0300
commit89c23755c8ab5d8c5bbbfa6e40eb0c6bda109dad (patch)
tree0619d977ce4ceecca0523f20a0609a293440e030 /usr.bin/diff
parent0ea3661a6ba0baaa39b95e836e8f2c87e2f4c20f (diff)
downloadotools-89c23755c8ab5d8c5bbbfa6e40eb0c6bda109dad.tar.gz
update CVS
Diffstat (limited to 'usr.bin/diff')
-rw-r--r--usr.bin/diff/CVS/Entries12
-rw-r--r--usr.bin/diff/diff.17
-rw-r--r--usr.bin/diff/diff.h4
3 files changed, 12 insertions, 11 deletions
diff --git a/usr.bin/diff/CVS/Entries b/usr.bin/diff/CVS/Entries
index 912da0e..80cc5ce 100644
--- a/usr.bin/diff/CVS/Entries
+++ b/usr.bin/diff/CVS/Entries
@@ -1,9 +1,9 @@
-/Makefile/1.3/Tue May 29 18:24:56 2007//
-/diff.1/1.49/Sat Feb 8 01:09:58 2020//
/diff.c/1.67/Fri Jun 28 13:35:00 2019//
-/diff.h/1.33/Mon Oct 5 20:15:00 2015//
-/diffdir.c/1.47/Fri Jan 25 00:19:26 2019//
/diffreg.c/1.93/Fri Jun 28 13:35:00 2019//
-/xmalloc.c/1.10/Fri Jun 28 05:44:09 2019//
-/xmalloc.h/1.4/Thu Nov 12 16:30:30 2015//
+/Makefile/1.3/Mon Oct 19 10:36:43 2020//
+/diff.1/1.50/Wed Jul 14 10:52:37 2021//
+/diff.h/1.34/Wed Jul 14 10:52:37 2021//
+/diffdir.c/1.47/Mon Oct 19 10:36:43 2020//
+/xmalloc.c/1.10/Mon Oct 19 10:36:43 2020//
+/xmalloc.h/1.4/Mon Oct 19 10:36:43 2020//
D
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index 353c770..85a168d 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diff.1,v 1.49 2020/02/08 01:09:58 jsg Exp $
+.\" $OpenBSD: diff.1,v 1.50 2021/03/08 02:47:27 jsg Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)diff.1 8.1 (Berkeley) 6/30/93
.\"
-.Dd $Mdocdate: February 8 2020 $
+.Dd $Mdocdate: March 8 2021 $
.Dt DIFF 1
.Os
.Sh NAME
@@ -453,8 +453,9 @@ An error occurred.
.%A James W. Hunt
.%A M. Douglas McIlroy
.%T "An Algorithm for Differential File Comparison"
+.%I AT&T Bell Laboratories
.%J Computing Science Technical Report
-.%Q Bell Laboratories 41
+.%N 41
.%D June 1976
.Re
.Sh STANDARDS
diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h
index 3a36222..c032350 100644
--- a/usr.bin/diff/diff.h
+++ b/usr.bin/diff/diff.h
@@ -1,6 +1,6 @@
+/* $OpenBSD: diff.h,v 1.34 2020/11/01 18:16:08 jcs Exp $ */
-
-/*ROR
+/*
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
*