On Thu, 25 Jun 2020 14:31:07 +0200, Stefan Sperling wrote:

> Patches for diff3, openrcs, and opencvs follow, even though tech@ would be
> a more appropriate forum for those. There is only one place to fix here
> because these tools lack the 3-way conflict output that got provides.
>
> I have added tests on got's symlink branch which confirm that this fix
> works as expected. And I have verified that merge(1) and diff3(1) now
> produce the expected output by comparing the new output to the already
> working case where 'baz' does contain a newline.

OK millert@

 - todd