From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Phillip Wood <phillip.wood123@gmail.com>
Subject: Re: What's cooking in git.git (Nov 2021, #05; Fri, 19)
Date: Sat, 20 Nov 2021 09:30:55 -0800 [thread overview]
Message-ID: <CABPp-BESjJpe6uqP2J54uvvn8+gA_fu0HGN5GZTSKkkQZ5_guQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqa6hznvz1.fsf@gitster.g>
On Fri, Nov 19, 2021 at 11:53 PM Junio C Hamano <gitster@pobox.com> 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@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.)
next prev parent reply other threads:[~2021-11-20 17:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-20 7:10 What's cooking in git.git (Nov 2021, #05; Fri, 19) Junio C Hamano
2021-11-20 11:18 ` Fabian Stelzer
2021-11-20 17:30 ` Elijah Newren [this message]
2021-11-20 22:20 ` vd/sparse-reset (Was: Re: What's cooking in git.git (Nov 2021, #05; Fri, 19)) Elijah Newren
2021-11-21 2:00 ` What's cooking in git.git (Nov 2021, #05; Fri, 19) Elijah Newren
2021-11-22 17:59 ` vd/sparse-sparsity-fix-on-read (Was: Re: What's cooking in git.git (Nov 2021, #05; Fri, 19)) Elijah Newren
2021-11-22 18:00 ` What's cooking in git.git (Nov 2021, #05; Fri, 19) Glen Choo
2021-11-22 18:05 ` Junio C Hamano
2021-11-22 22:36 ` Glen Choo
2021-11-23 13:22 ` ab/mark-leak-free-tests-even-more (was: What's cooking in git.git (Nov 2021, #05; Fri, 19)) Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPp-BESjJpe6uqP2J54uvvn8+gA_fu0HGN5GZTSKkkQZ5_guQ@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).