src/usr.bin/diff3, branch releng/13.4
FreeBSD source tree
https://cgit-dev.freebsd.org/src/atom?h=releng%2F13.4
2023-08-23T17:43:32Z
Remove $FreeBSD$: one-line nroff pattern
2023-08-23T17:43:32Z
Warner Losh
imp@FreeBSD.org
2023-08-22T01:32:13Z
urn:sha1:24115b70d6d614ed7ac5cfc4f51fa9d6cfe8b1b2
Remove /^\.\\"\s*\$FreeBSD\$$\n/
Similar commit in main:
(cherry picked from commit b2c76c41be32)
Remove $FreeBSD$: one-line sh pattern
2023-08-23T17:43:30Z
Warner Losh
imp@FreeBSD.org
2023-08-22T01:32:01Z
urn:sha1:023fc80ee38a117fa65b2ccb2abf8bdc7dbd6fd9
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
Similar commit in main:
(cherry picked from commit d0b2dbfa0ecf)
Remove $FreeBSD$: one-line .c pattern
2023-08-23T17:43:26Z
Warner Losh
imp@FreeBSD.org
2023-08-22T01:31:41Z
urn:sha1:3d497e17ebd33fe0f58d773e35ab994d750258d6
Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/
Similar commit in main:
(cherry picked from commit 1d386b48a555)
diff3: document and test -T
2021-09-25T08:34:39Z
Piotr Pawel Stefaniak
pstef@FreeBSD.org
2021-08-23T19:33:27Z
urn:sha1:a8446d4124d0639b0fe49e25642a18a51fde8666
(cherry picked from commit 9f7a81b133c715f649136dcd0ad004e4180c56c9)
diff3: implement --strip-trailing-cr
2021-09-25T08:34:39Z
Piotr Pawel Stefaniak
pstef@FreeBSD.org
2021-08-21T00:28:58Z
urn:sha1:dbabfd7e26763ac295ed0ee8bc77f3f3b58b6d03
(cherry picked from commit 54a3415cb69e1ea0e6533ca3fc168deba64f249f)
diff3.1: update manual page to match code
2021-09-25T08:34:39Z
Piotr Pawel Stefaniak
pstef@FreeBSD.org
2021-08-20T22:50:05Z
urn:sha1:000d03450ba0c5ac37f2a83335b6c09ada1dcca9
(cherry picked from commit e8ff95356ceaaa941251056e9d0a4211bf428e06)
diff3: improve style
2021-09-25T08:34:39Z
Piotr Pawel Stefaniak
pstef@FreeBSD.org
2021-08-20T21:50:20Z
urn:sha1:216bf478e24702ddfb310f27da0a51a81c822ed6
(cherry picked from commit 702dda4368dc2d07e8898fcfdddb12d730e6c174)
diff3: sync with upstream
2021-09-25T08:34:39Z
Piotr Pawel Stefaniak
pstef@FreeBSD.org
2021-08-20T21:35:24Z
urn:sha1:4bfbc5fbc93bec4f1098b7c7174411ec92404cb0
* replace realloc calls with reallocarray calls
* fix merging of files that lack newlines
Obtained from: OpenBSD
(cherry picked from commit 7f7b03f3897f0196e3cc7a3b71c7359cc206ba61)
Replace homemade getline(3) by actual getline(3)
2019-12-17T11:03:32Z
Baptiste Daroussin
bapt@FreeBSD.org
2019-12-17T11:03:32Z
urn:sha1:94678ee678338db8b61218a847d43e902f7e5311
Use strtoimax.
2019-12-17T09:13:48Z
Baptiste Daroussin
bapt@FreeBSD.org
2019-12-17T09:13:48Z
urn:sha1:9520071f7e2e3eb910dfe08a1f46e50a96c403c4
Use existing strtoimax instead of reinventing it