git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Documentation bug (?) when describing `zdiff3` merge format

From
Ppunk.lion0906@fastmail.com <punk.lion0906@fastmail.com>
Date
Aug 8, 2024, 20:25 UTC
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.
Previous: Kyle Lippincott
Message 5 of 5 in “Documentation bug (?) when describing `zdiff3` merge format”
  1. punk.lion0906@fastmail.comAug 8, 2024
  2. Johannes SixtAug 8, 2024
  3. Junio C HamanoAug 8, 2024
  4. Kyle LippincottAug 8, 2024
  5. punk.lion0906@fastmail.comAug 8, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.