> 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.
