summaryrefslogtreecommitdiff
path: root/usr.bin/diff/diff.1
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2004-12-09 18:56:11 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2004-12-09 18:56:11 +0000
commitfded6f6bd811efc6413e9533cf3d6b05431b0ac2 (patch)
tree94e7c44bef626ff4c1a7f167028f0b1c24bc8954 /usr.bin/diff/diff.1
parent877d6b209818d669ea266633e357c362f1ee9311 (diff)
If the -L option is specified twice, use it for the second filename
like GNU diff does. Adapted from a diff by YAMAMOTO Takashi
Diffstat (limited to 'usr.bin/diff/diff.1')
-rw-r--r--usr.bin/diff/diff.15
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index 48668dfd229..b14ca7d5519 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diff.1,v 1.26 2004/06/20 18:47:45 otto Exp $
+.\" $OpenBSD: diff.1,v 1.27 2004/12/09 18:56:10 millert Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -223,7 +223,8 @@ after all text file differences are reported.
.It Fl L Ar label
Print
.Ar label
-instead of the first file name and time in the context or unified diff header.
+instead of the first (and second, if this option is specified twice)
+file name and time in the context or unified diff header.
.It Fl p
With unified and context diffs, show with each change
the first 40 characters of the last line before the context beginning