aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2024-07-29 14:02:21 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2024-08-01 16:15:57 +0000
commit45fc37334d077d635dbfdd13f5e085513bf09d49 (patch)
tree42535d477996b7603c38ffe327a8626b6152c59b /usr.bin/diff
parentece4e05f4bf96a5bd2dad61ad057aa076ae5dc36 (diff)
Diffstat (limited to 'usr.bin/diff')
-rw-r--r--usr.bin/diff/diff.16
-rw-r--r--usr.bin/diff/diff.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index c10b130a2d72..3996f0388665 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -29,7 +29,7 @@
.\"
.\" @(#)diff.1 8.1 (Berkeley) 6/30/93
.\"
-.Dd June 29, 2024
+.Dd July 26, 2024
.Dt DIFF 1
.Os
.Sh NAME
@@ -199,7 +199,7 @@
.Op Fl aBbditwW
.Op Fl -color Ns = Ns Ar when
.Op Fl -expand-tabs
-.Op Fl -ignore-all-blanks
+.Op Fl -ignore-all-space
.Op Fl -ignore-blank-lines
.Op Fl -ignore-case
.Op Fl -minimal
@@ -422,7 +422,7 @@ output adds character(s) to the front of each line which may screw up
the indentation of the original source lines and make the output listing
difficult to interpret.
This option will preserve the original source's indentation.
-.It Fl w -ignore-all-blanks
+.It Fl w -ignore-all-space
Is similar to
.Fl b -ignore-space-change
but causes whitespace (blanks and tabs) to be totally ignored.
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
index 24e851ae9dbf..ba88964ca131 100644
--- a/usr.bin/diff/diff.c
+++ b/usr.bin/diff/diff.c
@@ -592,7 +592,7 @@ usage(void)
" diff [-aBbdilNPprsTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]\n"
" [--no-ignore-case] [--normal] [--tabsize] [-I pattern] [-L label]\n"
" [-F pattern] [-S name] [-X file] [-x pattern] dir1 dir2\n"
- " diff [-aBbditwW] [--expand-tabs] [--ignore-all-blanks]\n"
+ " diff [-aBbditwW] [--expand-tabs] [--ignore-all-space]\n"
" [--ignore-blank-lines] [--ignore-case] [--minimal]\n"
" [--no-ignore-file-name-case] [--strip-trailing-cr]\n"
" [--suppress-common-lines] [--tabsize] [--text] [--width]\n"