src/usr.bin/diff3, branch releng/14.2 FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=releng%2F14.2 2023-08-16T17:55:15Z Remove $FreeBSD$: one-line nroff pattern 2023-08-16T17:55:15Z Warner Losh imp@FreeBSD.org 2023-08-16T17:55:15Z urn:sha1:b2c76c41be32f904179efed29c0ca04d53f3996c Remove /^\.\\"\s*\$FreeBSD\$$\n/ Remove $FreeBSD$: one-line sh pattern 2023-08-16T17:55:03Z Warner Losh imp@FreeBSD.org 2023-08-16T17:55:03Z urn:sha1:d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ Remove $FreeBSD$: one-line .c pattern 2023-08-16T17:54:42Z Warner Losh imp@FreeBSD.org 2023-08-16T17:54:42Z urn:sha1:1d386b48a555f61cb7325543adbbb5c3f3407a66 Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/ diff3: Use ranges for new and old diffedits in ed scripts 2022-08-02T13:38:11Z Tom Jones thj@FreeBSD.org 2022-08-02T13:33:17Z urn:sha1:190c4c2499e64e1c88f25f68c2929d110d635300 This should make the output logic easier to read. No functional change intended. Sponsored by: Klara, Inc. diff3: Use ranges for the old and new diffedits in A scripts 2022-08-02T13:37:05Z Tom Jones thj@FreeBSD.org 2022-08-02T13:29:38Z urn:sha1:c0e6ccb12ab930b122dc18b6079b563bd347155f This makes the output logic easier to read. No functional change intended. Sponsored by: Klara, Inc. diff3: Simplify startmark calculation in Ascript 2022-08-02T13:36:05Z Tom Jones thj@FreeBSD.org 2022-08-02T13:23:10Z urn:sha1:264a559ac827d0bf81986cd5758594fc687d5bd5 Remove redundant calculation for startmark. Sponsored by: Klara, Inc. diff3: Use variables for old and new in A scripts 2022-08-01T13:54:20Z Tom Jones thj@FreeBSD.org 2022-08-01T13:48:35Z urn:sha1:2c4276aaa2d03217b9c1797196864bbbe4f2d8ea This makes the code easier to follow, no functional changes intended Sponsored by: Klara, Inc. diff3: Replace literal marker with variable 2022-08-01T13:53:53Z Tom Jones thj@FreeBSD.org 2022-08-01T13:46:09Z urn:sha1:ca53a8445ab32987b118011c25c520eedf58881c Sponsored by: Klara, Inc. diff3: Fix indentation 2022-08-01T13:14:25Z Tom Jones thj@FreeBSD.org 2022-08-01T13:14:25Z urn:sha1:85d92faf434ac8b336d09dfbce5c324fa53c4bc1 Sponsored by: Klara, Inc. diff3: make the eflag logic easier to follow 2022-07-05T11:36:11Z Tom Jones thj@FreeBSD.org 2022-07-05T11:33:55Z urn:sha1:d458eb8de12cc656b324f6094e6ed1eedc35625a Discussed with: dim Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D35324