summaryrefslogtreecommitdiff
path: root/usr.bin/diff/diff.1
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2003-09-07 18:50:59 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2003-09-07 18:50:59 +0000
commit066c8a154db03cac36c3631603c9dfa9b5f292c2 (patch)
tree8a76271c179b09c22b031d6dd728b0f6131ff06f /usr.bin/diff/diff.1
parent489d46253d126ce011dfd7bd1e98d466890987e4 (diff)
- add -P to SYNOPSIS
- remove "mutually exclusive" clause - -c produces 15 *'s, not a dozen - add -a to uage() - sync usage() with SYNOPSIS ok tedu@
Diffstat (limited to 'usr.bin/diff/diff.1')
-rw-r--r--usr.bin/diff/diff.110
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index 31c7624f194..cc17b63b3ad 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diff.1,v 1.20 2003/07/27 18:32:49 otto Exp $
+.\" $OpenBSD: diff.1,v 1.21 2003/09/07 18:50:58 jmc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -59,7 +59,7 @@
.Fl U Ar number
.Ar file1 file2
.Nm diff
-.Op Fl abdilNqtTw
+.Op Fl abdilNPqtTw
.Oo
.Fl c | Fl e | Fl f |
.Fl n | Fl u
@@ -84,16 +84,16 @@ and writes to the standard output the list of changes necessary to
convert one file into the other.
No output is produced if the files are identical.
.Pp
-Output options (mutually exclusive):
+Output options:
.Bl -tag -width Ds
.It Fl c
Produces a diff with 3 lines of context.
With
.Fl c
the output format is modified slightly:
-the output beginning with identification of the files involved and
+the output begins with identification of the files involved and
their creation dates and then each change is separated
-by a line with a dozen *'s.
+by a line with fifteen *'s.
The lines removed from
.Ar file1
are marked with