aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff3/diff3.1
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/diff3/diff3.1')
-rw-r--r--usr.bin/diff3/diff3.13
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.bin/diff3/diff3.1 b/usr.bin/diff3/diff3.1
index cc4bdf1c8836..22e04b6af5e8 100644
--- a/usr.bin/diff3/diff3.1
+++ b/usr.bin/diff3/diff3.1
@@ -40,6 +40,7 @@
.Nm diff3
.Op Fl 3aEeiXx
.Op Fl Fl diff-program Ar program
+.Op Fl Fl strip-trailing-cr
.Op Fl L | Fl Fl label Ar label1
.Op Fl L | Fl Fl label Ar label2
.Op Fl L | Fl Fl label Ar label3
@@ -125,6 +126,8 @@ Use
instead of the default
.Xr diff 1
to compare files.
+.It Fl Fl strip-trailing-cr
+Strip trailing carriage return on input files.
.El
.Pp
The