From: Stefan Sperling <stsp@stsp.name>
Subject: Re: show original content in merge conflicts
To: "Todd C. Miller" <Todd.Miller@sudo.ws>, gameoftrees@openbsd.org
Date: Sat, 12 Oct 2019 09:37:55 +0200

On Fri, Oct 11, 2019 at 04:22:57PM +0200, Stefan Sperling wrote:
> It might make sense to only show the new marker and original lines
> if diff3 actually has some data to show there.

I have pushed a version of the patch which also implements the above.

I am still unsure if the original region of content is always identified
correctly. If anyone spots a case where it looks wrong, please let me know.

Thanks for your feedback :)