aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff3/diff3.1
diff options
context:
space:
mode:
authorPiotr Pawel Stefaniak <pstef@FreeBSD.org>2021-08-23 19:33:27 +0000
committerPiotr Pawel Stefaniak <pstef@FreeBSD.org>2021-08-25 16:20:59 +0000
commit9f7a81b133c715f649136dcd0ad004e4180c56c9 (patch)
tree1302dc746381f0f3c72f6a0708be01b22b5727df /usr.bin/diff3/diff3.1
parent76321d2d432ed270d93b282e54e59b708c0cf3b4 (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 22e04b6af5e8..2cf1e57cb74e 100644
--- a/usr.bin/diff3/diff3.1
+++ b/usr.bin/diff3/diff3.1
@@ -30,7 +30,7 @@
.\" @(#)diff3.1 8.2 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
-.Dd May 25, 2017
+.Dd August 23, 2021
.Dt DIFF3 1
.Os
.Sh NAME
@@ -38,7 +38,7 @@
.Nd 3-way differential file comparison
.Sh SYNOPSIS
.Nm diff3
-.Op Fl 3aEeiXx
+.Op Fl 3aEeiTXx
.Op Fl Fl diff-program Ar program
.Op Fl Fl strip-trailing-cr
.Op Fl L | Fl Fl label Ar label1
@@ -115,6 +115,13 @@ Defines labels to print instead of file names
.Ar file2
and
.Ar file3 .
+.It Fl T, Fl Fl initial-tab
+In the normal listing,
+use a tab instead of two spaces
+at the beginning of each line.
+In modes that produce an
+.Xr ed 1
+script, this option changes nothing.
.It Fl x, Fl Fl overlap-only
Produces an output script suitable for
.Xr ed 1