On Mon, 12 Apr 2021 21:23:11 +0200, Stefan Sperling wrote:

> Josh Rickmar reported a bug on #gameoftrees IRC that ended up being
> shared with diff3 code inherited from OpenBSD. See here for details
> and patches for the OpenBSD base tools:
> https://marc.info/?l=openbsd-tech&m=161825519000776&w=2
>
> This is the corresponding fix for the diff3 code in Got.
> It makes the problematic cherrypick which Josh identified succeed.

Looks good to me.  OK millert@

 - todd