Page MenuHomeFreeBSD
Files F164553042

D48388.id148962.diff
No OneTemporary
Actions

D48388.id148962.diff
View Options

diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd July 26, 2024
+.Dd January 7, 2025
.Dt DIFF 1
.Os
.Sh NAME
@@ -95,7 +95,7 @@
.Op Fl -strip-trailing-cr
.Op Fl -tabsize Ar number
.Op Fl -text
-.Fl C Ar number | -context Ar number
+.Fl C Ar number | Fl -context Ar number
.Ar file1 file2
.Nm diff
.Op Fl aBbdiltw
@@ -354,7 +354,7 @@
.Pp
Comparison options:
.Bl -tag -width Ds
-.It Fl A Ar algo, Fl -algorithm Ar algo
+.It Fl A Ar algo , Fl -algorithm Ar algo
Configure the algorithm used when comparing files.
.Nm
supports 3 algorithms:
@@ -420,9 +420,9 @@
Try very hard to produce a diff as small as possible.
This may consume a lot of processing power and memory when processing
large files with many changes.
-.It Fl F Ar pattern, Fl -show-function-line Ar pattern
+.It Fl F Ar pattern , Fl -show-function-line Ar pattern
Like
-.Fl p,
+.Fl p ,
but display the last line that matches provided pattern.
.It Fl I Ar pattern Fl -ignore-matching-lines Ar pattern
Ignores changes, insertions, and deletions whose lines match the
@@ -483,7 +483,7 @@
columns when using side by side format.
The default value is 130.
Note that unless
-.It Fl t
+.Fl t
was specified,
.Nm
will always align the second column to a tab stop, so values of
@@ -695,7 +695,7 @@
.Bl -tag -width DIFFCOLORS
.It Ev DIFFCOLORS
The value of this variable is the form
-.Ar add Ns : Ns Ar rm ,
+.Ar add : Ns Ar rm ,
where
.Ar add
is the ASCII escape sequence for additions and
@@ -818,4 +818,5 @@
Some GNUisms were lost in the process.
.Pp
libdiff was imported from the Game of Trees version control system and default
-algorithm was changed to Myers for FreeBSD 15.
+algorithm was changed to Myers for
+.Fx 15 .

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 3, 1:41 AM (14 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35880258
Default Alt Text
D48388.id148962.diff (1 KB)

Event Timeline