From nobody Sun Mar 01 11:48:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fP0gl0jVWz6SqJZ; Sun, 01 Mar 2026 11:48:19 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fP0gk75Nxz3vyT; Sun, 01 Mar 2026 11:48:18 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772365699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DzSNYQtUSciN+400OBVCHzF0R0qbJkOjZUozLAN7TPg=; b=Q/gHrdunR5bfcGU/xFTd3WSBdKe3kmdohcSj79PeacFs4HhMYfgzaGM6rzfjm69YwM4kKG N31poBPBG+TGPXo06BM+EbHW6d+R2pf6uoRHVZ0MemTJ0mc+j9rM47W8Kq+5eDARa1n0PY hYhSPhDu+mUi2YNeUiGzNOA/ssPxEfnUGu3JFmcHa26GXHaUEoWHTVdqj6pi2Q+7jnrXfO pLXjmcBAfpE1vqKb5dY4Kg+CwadVPlh+IpoAmMDIgBmN5wFKaJdfXe/cXo5gBTlW0K20E8 foL+IDkVCloliBG1IjHl/e+NCnQGVxK9Wfg+ETO39nBN91l+RdGLsSnIvqVrAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772365699; a=rsa-sha256; cv=none; b=uWcDEUn/XFrP29/rqjsndld3WyGN0WyrBY9+ZXxhifouOL3nekKBWh1rIMlPZSZ2ZWyvDU NXqK1Mc9PBGsMCVmyNeyb2LUtYBYCweOgGShAL6JRnPPgyTVa2dX5A2m3XhjRWUdQYrtY/ AZR5dX52xYpwmVW6024/Pxaq/9kMoPGIIgSdgcIfHJ3BvMFfxvqFFMG6BFSIKYwIlvkeW+ vhshxIeQwxcDOR1FF3cfZt9v8K5IbY1L+7Z8AmkesmYcOeoQbwjfirwZMXXTjvV4OjVsCD 7EwPPqoSPMm47Bw1U9zhcdWFCSWRJ6GAFypJydb/noALipih+AB+TvOu/wTfkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772365699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DzSNYQtUSciN+400OBVCHzF0R0qbJkOjZUozLAN7TPg=; b=SCsIIZxkTddsPX+I50f/IKiR6+WE5pq49d9GW6dablGnscCY26iVqLl3qFujcknICW15XO qHBR3IHgHhW1cClXPIsMZNoq5F2v31I053hnISaATlVofMlUgTCSuo067xujQj38HGuH9E 1wXDwJeL8ZkqcqiojmboAED2dCbscS/ALeamCXB3VS/R4iioh1PTq7pc6/S5ptcxCn/waZ Sd7mPp6D1SskBiDqLT3ljcRlyoubsYCeTIhczdHlw44kBIzc373Rv0M4TMuwNEo8DS/xY0 lfnmJjTSvAUn9f59PNJsOdDrVCTwT1Tqi3EGjFgCNxAv7mzum3dmUNCpx6K6og== Received: from ltc.des.dev (lfbn-nan-1-698-103.w86-236.abo.wanadoo.fr [86.236.35.103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fP0gk5SHNzDcM; Sun, 01 Mar 2026 11:48:18 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 01DA4F76A1; Sun, 01 Mar 2026 12:48:16 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: "Enji Cooper (yaneurabeya)" Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: c2dee7786bf3 - main - diff3: Code cleanup 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> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sun, 01 Mar 2026 12:48:16 +0100 Message-ID: <86tsuzojnj.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable "Enji Cooper (yaneurabeya)" 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 --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org