From: punk.lion0906@fastmail.com
Date: Thu, 08 Aug 2024 20:25:37 GMT
Subject: Re: Documentation bug (?) when describing `zdiff3` merge format
Message-ID: <9c46732a-eea5-4849-91d8-aa4cc3dc92f1@app.fastmail.com>
In-Reply-To: <CAO_smVg=1gFBudrd70V2_AXSPOUTFz=j7QqBpbkvR7P_KqnBtQ@mail.gmail.com>

> This line _still changed_, even though there were conflicts around it,

Ah, thanks for pointing this out, I absolutely missed that. My mind parsed
"... identically" and "... the same way" in the same way.

Now the situation makes a bit more sense, I'm getting a sense of *what* `zdiff3` is doing, even though I still don't quite follow the why.

In any case, in my mind this is now a documentation bug where `zdiff3` is not explained as well as it could be. I don't understand the situation enough to provide the fix, though.

Thank you, everyone, for the help!
               Ilya.