diff options
| author | Tom Jones <thj@FreeBSD.org> | 2022-04-19 15:20:24 +0000 |
|---|---|---|
| committer | Tom Jones <thj@FreeBSD.org> | 2022-04-19 15:20:24 +0000 |
| commit | 034dd2d54f2e7e33897cfd5ede7c50b3d67d18d3 (patch) | |
| tree | 31cd37cadc9fc1776bcc9ea4dab98ee6c10b6509 /usr.bin/diff3/diff3.1 | |
| parent | f45f90c5d6f0f0d53998476281d42d857adf98c7 (diff) | |
Diffstat (limited to 'usr.bin/diff3/diff3.1')
| -rw-r--r-- | usr.bin/diff3/diff3.1 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/diff3/diff3.1 b/usr.bin/diff3/diff3.1 index f0fd481c75f1..6968af44bfbd 100644 --- a/usr.bin/diff3/diff3.1 +++ b/usr.bin/diff3/diff3.1 @@ -38,7 +38,7 @@ .Nd 3-way differential file comparison .Sh SYNOPSIS .Nm diff3 -.Op Fl 3AaEeiTXx +.Op Fl 3AaEeimTXx .Op Fl Fl diff-program Ar program .Op Fl Fl strip-trailing-cr .Op Fl L | Fl Fl label Ar label1 @@ -117,6 +117,8 @@ Defines labels to print instead of file names .Ar file2 and .Ar file3 . +.It Fl m, Fl Fl merge +Merge output instead of generating ed script. .It Fl T, Fl Fl initial-tab In the normal listing, use a tab instead of two spaces |