summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff/diff.1
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2003-06-27 20:28:13 +0000
committertedu <tedu@openbsd.org>2003-06-27 20:28:13 +0000
commit2a1593df6988ca85abee7f39eb02a22b6cb6f306 (patch)
tree7826bfd9da745ebb02bce3cf17afacf6a2bffb4e /usr.bin/diff/diff.1
parentmore quirks from netbsd (diff)
downloadwireguard-openbsd-2a1593df6988ca85abee7f39eb02a22b6cb6f306.tar.xz
wireguard-openbsd-2a1593df6988ca85abee7f39eb02a22b6cb6f306.zip
-a to force ascii compare. ok millert
Diffstat (limited to 'usr.bin/diff/diff.1')
-rw-r--r--usr.bin/diff/diff.114
1 files changed, 8 insertions, 6 deletions
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index 481cbd7a81d..317130d7d75 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diff.1,v 1.6 2003/06/26 04:53:02 millert Exp $
+.\" $OpenBSD: diff.1,v 1.7 2003/06/27 20:28:13 tedu Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -37,26 +37,26 @@
.Nd differential file and directory comparator
.Sh SYNOPSIS
.Nm diff
-.Op Fl bitw
+.Op Fl abitw
.Oo
.Fl c | Fl e | Fl f |
.Fl h | Fl n | Fl u
.Oc
.Ar file1 file2
.Nm diff
-.Op Fl bitw
+.Op Fl abitw
.Op Fl C Ar number
.Ar file1 file2
.Nm diff
-.Op Fl bitw
+.Op Fl abitw
.Op Fl D Ar string
.Ar file1 file2
.Nm diff
-.Op Fl bitw
+.Op Fl abitw
.Op Fl U Ar number
.Ar file1 file2
.Nm diff
-.Op Fl bitw
+.Op Fl abitw
.Oo
.Fl c | Fl e | Fl f |
.Fl h | Fl n | Fl u
@@ -79,6 +79,8 @@ No output is produced if the files are identical.
.Pp
Output options (mutually exclusive):
.Bl -tag -width Ds
+.It Fl a
+Treat all files as ascii.
.It Fl c
Produces a diff with 3 lines of context.
With