From: Stefan Sperling <stsp@stsp.name>
Subject: Re: diff.git: Fix ed script output
To: Tom Jones <thj@freebsd.org>
Cc: gameoftrees@openbsd.org
Date: Tue, 30 Aug 2022 17:19:29 +0200

On Tue, Aug 30, 2022 at 02:47:58PM +0100, Tom Jones wrote:
> Prior to this change ed script output was in the wrong order, i.e. in
> the order diff_result provides and changes where missing added or
> changed lines. ed edits need to be in reverse order to keep the edited
> file in sync 

As it is, this patch breaks merging on Got, which relies on the
existing output. The existing output is based on the 'ed-style'
script which Caldera diff3(1) generates internally. As you've
discovered this seems to not match traditional diff(1) ed output,
which is unfortunate, and I was unaware of this when I added the
ed output module for the purpose of supporting Got's merging code.

So we will need both variants. Should we add a flag?
Or would providing two different ed-output modules be better?