From: Stefan Sperling <stsp@stsp.name>
Subject: Re: merge chokes, creates bogus conflicts
To: Mark Jamsek <mark@jamsek.com>
Cc: Christian Weisgerber <naddy@mips.inka.de>, gameoftrees@openbsd.org
Date: Sat, 18 Feb 2023 16:45:46 +0100

On Sun, Feb 19, 2023 at 01:57:23AM +1100, Mark Jamsek wrote:
> Updated diff incorporates all your suggestions. Thanks for the
> improvements :)

Thanks! ok by me. We can add the diff_result performance tweak
on top once you or myself find time to implement it.