On Fri, Nov 19, 2021 at 11:53 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > * 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@xxxxxxxxx/, 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.)
