Date: Sun, 01 Mar 2026 12:48:16 +0100 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@FreeBSD.org> To: "Enji Cooper (yaneurabeya)" <yaneurabeya@gmail.com> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup Message-ID: <86tsuzojnj.fsf@ltc.des.dev> In-Reply-To: <5A228777-56E5-49AA-9F20-99543F397059@gmail.com> (Enji Cooper's message of "Sat, 28 Feb 2026 23:48:21 -0800") References: <69a330d5.44fd2.56809847@gitrepo.freebsd.org> <5A228777-56E5-49AA-9F20-99543F397059@gmail.com>
index | next in thread | previous in thread | raw e-mail
"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.orghome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86tsuzojnj.fsf>