Date: Sat, 28 Feb 2026 23:48:21 -0800 From: "Enji Cooper (yaneurabeya)" <yaneurabeya@gmail.com> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@FreeBSD.org> 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: <5A228777-56E5-49AA-9F20-99543F397059@gmail.com> In-Reply-To: <69a330d5.44fd2.56809847@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] > 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 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmmj70UACgkQGpE5DjPs NJgJHA//TmBhKFPjNOvztpWtghUfkXE9ZpRmRbhRvcHc/0lupljkuMMiiTz2CVVF 5TvV+JHm83oBAO9pogsoqpjIKxYtvfKgluYSzDlog99bNbFLnNtMv4kEeW1smM9I m2aDvwEF+sNHGUBD1OoJ51d/aMpA8+WAN/8J9qiGtpnt3/IysusZVxhG/Uz5kgmL qhptseL6bVtN8JwK+KJbKaswOPVR7hqVE10mY9umNzjIPap/FKTObmKBl4JURQdy od6uIzNml9ZuYNYBcHGSfnbXDihB2bLZnyHkARLDUyz9QOJdP5gDxzm5bVqdFCrr u0zMQHD5jEV8YlG2CL7QGCEQKZ0oztO9qLwwtL36YOWeaVERAMR/J+a/x8QTUKQP gUa4eg730bdi/w947wNuxhusPyQ7W7h5OjfXAt+MJv1JOahdkZzXBNHycH0gcGXT NEdgKf2KMvYltUb8FznJMFWNlJAA7Pc7KdrTy2+LSHBa+DTEd5WNn4b2OhcSEmF6 XNwf+w6SG9WeyI/MEsSt/gGkumR8+tz+qQJnnYNc0nP8pcZEnAlVz3/59AKmVufj Osd4UG/3+BxC6ChSSECitpCoRJror1hu22jJTvFXwebgp5ju2irvamQvxAg5XM3T GBUujKHW5QixZbOGXiOsXw0vkSZSpIbdM1kXZXNPBUe+zZWs3q8= =4jYQ -----END PGP SIGNATURE-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5A228777-56E5-49AA-9F20-99543F397059>