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

Re: What's cooking in git.git (Nov 2021, #05; Fri, 19)

From
Elijah Newren <newren@gmail.com>
Date
Nov 20, 2021, 17:30 UTC
Message-ID
<CABPp-BESjJpe6uqP2J54uvvn8+gA_fu0HGN5GZTSKkkQZ5_guQ@mail.gmail.com>
In-Reply-To
<xmqqa6hznvz1.fsf@gitster.g>
On Fri, Nov 19, 2021 at 11:53 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 8 quoted lines
>
> * en/zdiff3 (2021-09-20) 2 commits
>  - update documentation for new zdiff3 conflictStyle
>  - xdiff: implement a zealous diff3, or "zdiff3"
>
>  "Zealous diff3" style of merge conflict presentation has been added.
>
>  What's the status of this thing?

Submitted a v4 this week at https://lore.kernel.org/git/pull.1036.v4.git.git.1637028785.gitgitgadget@gmail.com/, and finally removed the RFC label.

As a side note, the zdiff3 work also spurred a separate (independent) series from Phillip that you picked up at pw/xdiff-classify-record-in-histogram. (An intermediate version of zdiff3 between v3 and v4 had a bug where it only worked with histogram diffs. Phillip went digging and not only fixed the zdiff3 bug, but found a nice performance win for histogram diffs.)

Previous: Fabian StelzerNext: Elijah Newren
Message 3 of 10 in “What's cooking in git.git (Nov 2021, #05; Fri, 19)”
  1. Junio C HamanoNov 20, 2021
  2. Fabian StelzerNov 20, 2021
  3. Elijah NewrenNov 20, 2021
  4. vd/sparse-reset (Was: Re: What's cooking in git.git (Nov 2021, #05; Fri, 19))Elijah Newren, Nov 20, 2021
  5. Elijah NewrenNov 21, 2021
  6. vd/sparse-sparsity-fix-on-read (Was: Re: What's cooking in git.git (Nov 2021, #05; Fri, 19))Elijah Newren, Nov 22, 2021
  7. Glen ChooNov 22, 2021
  8. Junio C HamanoNov 22, 2021
  9. Glen ChooNov 22, 2021
  10. ab/mark-leak-free-tests-even-more (was: What's cooking in git.git (Nov 2021, #05; Fri, 19))Ævar Arnfjörð Bjarmason, Nov 23, 2021

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.