aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff3/diff3.1
diff options
context:
space:
mode:
authorTom Jones <thj@FreeBSD.org>2022-06-23 12:37:28 +0000
committerTom Jones <thj@FreeBSD.org>2022-06-23 12:37:28 +0000
commit26b5deef22ae316646b6bd173414826a9598b666 (patch)
treec5b6e577a92848fa1ab62f6b816c0938e0c7764e /usr.bin/diff3/diff3.1
parented366c37d85a7ac7c58fcf3a0e8db980d099285c (diff)
Diffstat (limited to 'usr.bin/diff3/diff3.1')
-rw-r--r--usr.bin/diff3/diff3.111
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.bin/diff3/diff3.1 b/usr.bin/diff3/diff3.1
index 6968af44bfbd..fcd9bb413089 100644
--- a/usr.bin/diff3/diff3.1
+++ b/usr.bin/diff3/diff3.1
@@ -30,14 +30,14 @@
.\" @(#)diff3.1 8.2 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
-.Dd April 19, 2022
+.Dd June 23, 2022
.Dt DIFF3 1
.Os
.Sh NAME
.Nm diff3
.Nd 3-way differential file comparison
.Sh SYNOPSIS
-.Nm diff3
+.Nm
.Op Fl 3AaEeimTXx
.Op Fl Fl diff-program Ar program
.Op Fl Fl strip-trailing-cr
@@ -45,6 +45,9 @@
.Op Fl L | Fl Fl label Ar label2
.Op Fl L | Fl Fl label Ar label3
.Ar file1 file2 file3
+.Nm
+.Op Fl Fl help
+.Op Fl Fl version
.Sh DESCRIPTION
The
.Nm
@@ -107,6 +110,8 @@ and
It is useful for backing out changes specific to
.Ar file2
only.
+.It Fl Fl help
+Prints usage information and exits.
.It Fl i
Appends 'w' and 'q'
.Xr ed 1
@@ -139,6 +144,8 @@ instead of the default
to compare files.
.It Fl Fl strip-trailing-cr
Strip trailing carriage return on input files.
+.It Fl Fl version
+Prints version information and exits.
.El
.Pp
The