This is actually
45 commits:
> commit
5ca02f6a36d79f6e5f4e1ed912ac055881f10161fac95c8b38751bc4e64b64179be4b36f8a45ce3 (HEAD
-> private)
> Author: Piotr Pawel Stefaniak <pstef@FreeBSD.org>
> Date: Sun Aug 22 12:08:39 2021 +0200
>
> Register /usr/tests/usr.bin/diff3
>
> I wasn't able to make check to run diff3 tests, but kevans figured out
> that I was missing diff3 in mtree.
>
> commit 1da4e59b6bf2cbfa03eb02042bb55c5df2ee88a8
> Author: Piotr Pawel Stefaniak <pstef@FreeBSD.org>
> Date: Sat Aug 21 02:28:58 2021 +0200
>
> diff3: implement --strip-trailing-cr
>
> commit
368c8fa3c31cd65c80627da92f8e98dfde984f57e24570f461d3ac4d9a0c6e906b7b2bfd0454aa9f
> Author: Piotr Pawel Stefaniak <pstef@FreeBSD.org>
> Date: Sat Aug 21 00:50:05 2021 +0200
>
> diff3.1: update manual page to match code
>
> commit a
5822ce7a60d59e79fcb500ddc3442ad0ed10a1d82db9fd9b80c79d57800bc86fb9998398271496
> Author: Piotr Pawel Stefaniak <pstef@FreeBSD.org>
> Date: Fri Aug 20 23:50:20 2021 +0200
>
> diff3: improve style
>
> commit 7548a41c40d5aca3e09245bece4d252ea3caec2c
> Author: Piotr Pawel Stefaniak <pstef@FreeBSD.org>
> Date: Fri Aug 20 23:35:24 2021 +0200
>
> diff3: sync with upstream
>
> * replace realloc calls with reallocarray calls
> * fix merging of files that lack newlines
>
> Obtained from: OpenBSD