Re: git: c2dee7786bf3 - main - diff3: Code cleanup

> On Feb 28, 2026, at 10:15 AM, Dag-Erling Smørgrav <des@FreeBSD.org> wrote:
> 
> The branch main has been updated by des:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=c2dee7786bf32cb66cedec226e42e79e06457c51
> 
> commit c2dee7786bf32cb66cedec226e42e79e06457c51
> Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
> AuthorDate: 2026-02-28 18:15:23 +0000
> Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
> CommitDate: 2026-02-28 18:15:23 +0000
> 
>    diff3: Code cleanup
> 
>    * Order includes.
> 
>    * Turn the diff type into an enum.
> 
>    * Turn an unreachable error message into an assertion.
> 
>    * Remove unused debugging code.
> 
>    * Remove some dead assignments.
> 
>    * Consistently use 1 instead of EXIT_FAILURE.
> 
>    * Turn a return from main() into an exit().
> 
>    MFC after:      1 week
>    Sponsored by:   Klara, Inc.
>    Reviewed by:    bapt
>    Differential Revision:  https://reviews.freebsd.org/D55517

Hi des@,
	It looks like the diff3(1) code came from OpenBSD (at one point in time). Are there any plans to converge/merge with that codebase in the future?
Thanks!
-Enji