This is actually 3 commits:
> commit 368c8fa3c31cd65c80627da92f8e98dfde984f57 (HEAD)
> 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 a5822ce7a60d59e79fcb500ddc3442ad0ed10a1d
> 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