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

Reply: Enji Cooper : "Re: git: c2dee7786bf3 - main - diff3: Code cleanup"
In reply to: Enji Cooper (yaneurabeya): "Re: git: c2dee7786bf3 - main - diff3: Code cleanup"
Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Dag-Erling_Smørgrav <des_at_FreeBSD.org>
Date: Sun, 01 Mar 2026 11:48:16 UTC

"Enji Cooper (yaneurabeya)" <yaneurabeya@gmail.com> writes:
> 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?

Theirs doesn't work.  Ours does, and that took a lot of work.  They're
welcome to merge our improvements.

DES
-- 
Dag-Erling Smørgrav - des@FreeBSD.org