Johannes Sixt [off-list ref] writes:
This is exactly the problem that zdiff3 has: There is no way to indicate
that some line in the common ancester was resolved identically and is
now outside the conflict markers. Do not use zdiff3 if you cannot live
with this deficiency. This is in fact not made explicit in the
documentation.
Yes, indeed that is a problem and that is not I personally do not
touch it even with a 10ft pole. We might want to stress it a bit
more to warn potential users in our documentation.
#leftoverbits then?
Thanks.