src/usr.bin/diff/diff.1, branch releng/14.4

diff: Fix usage message and documentation.

2024-08-01T16:15:57Z

The `--ignore-all-space` option was incorrectly documented as `--ignore-all-blanks` in some (but not all) places. MFC after: 3 days PR: 280434 Sponsored by: Klara, Inc. Reviewed by: 0mp, markj Differential Revision: https://reviews.freebsd.org/D46160 (cherry picked from commit ab830de9f58c1b257e42b4fbdd46b3ca6a837ee6)

diff: Document the --no-dereference option.

2024-07-04T15:31:09Z

Also, --no-dereference should not imply --recurse. MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D45779 (cherry picked from commit 4ce4a0fe14c455c6ec77452bc99cd93ea45737b1)

diff: Fix --expand-tabs and --side-by-side.

2024-03-11T12:19:06Z

* Overhaul column width and padding calculation. * Rewrite print_space() so it is now a) correct and b) understandable. * Rewrite tab expansion in fetch() for the same reason. This brings us in line with GNU diff for all cases I could think of. Sponsored by: Klara, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D44014 (cherry picked from commit 53de23f4d140becc3166e87665b0064f215a220e) diff: Bump manual page date. Sponsored by: Klara, Inc. (cherry picked from commit 312b1076c6b0aff9bbcaff058b93385eaf607685)

Remove $FreeBSD$: one-line nroff pattern

2023-08-16T17:55:15Z

Remove /^\.\\"\s*\$FreeBSD\$$\n/

diff: add support for --help and --version

2022-03-10T16:17:37Z

Add support for --help and --version to be compatible with gnu diff. gnu diff --help writes to stdout, do the same to be compatible Reviewed by: bapt, pstef, debrup, Pau Amma Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D34508

diff: Detect Objective-C methods

2022-02-18T15:09:57Z

When searching back for function definitions, consider lines starting with '+' and '-', this allows us to pick up Objective-C methods as well as C style function definitions. Reviewed by: bapt Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D34202

diff: implement option -F (--show-function-line)

2021-09-15T23:46:44Z

With unified and context diffs, show the last line that matches the provided pattern before the context. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D31714

diff(1): Add --color support

2021-09-15T23:46:44Z

Adds a --color flag to diff(1) that supports the same options as GNU's diff(1). The colors are customizable with the env var DIFFCOLORS in a format similar to grep(1)'s GREPCOLORS. An example would be 04;36:41 for additions to be underlined light blue, and deletions have a red background. Differential Revision: https://reviews.freebsd.org/D30545

diff(1): Add EXAMPLES section

2020-06-19T06:48:16Z

Add examples for -r, -u, -N, -x, -q and -I Approved by: 0mp@ Differential Revision: https://reviews.freebsd.org/D25345

Document long version of -b option

2020-06-01T09:15:15Z

PR: 234195 Submitted by: Fehmi Noyan Isi Reported by: Andras Farkas MFC after: 3 days