src/usr.bin/diff3, branch release/13.2.0 FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=release%2F13.2.0 2021-09-25T08:34:39Z 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 capsicum: use a new capsicum helpers in tools 2018-11-04T19:24:49Z Mariusz Zaborski oshogbo@FreeBSD.org 2018-11-04T19:24:49Z urn:sha1:377421df9690cddad7f0c8cba84bd392e62a3b6c Use caph_{rights,ioctls,fcntls}_limit to simplify the code. Convert `cap_enter() < 0 && errno != ENOSYS` to `caph_enter() < 0`. 2018-06-19T23:43:14Z Mariusz Zaborski oshogbo@FreeBSD.org 2018-06-19T23:43:14Z urn:sha1:7672a0148f79063eac8f8e0beb0db5350d02d5d4 No functional change intended. DIRDEPS_BUILD: Connect new directories. 2017-10-31T00:04:07Z Bryan Drewery bdrewery@FreeBSD.org 2017-10-31T00:04:07Z urn:sha1:3806950135d2c8633ec0764e8807eacc87cf3e10 Sponsored by: Dell EMC Isilon