# Re: en/zdiff3

- From: Junio C Hamano \<hidden\>
- Date: 2021-12-01 22:15:15 
- List: git
- Page: https://ratatoskr.run/git/2021/12/7913664
- Thread: https://ratatoskr.run/git/2021/12/7913664/t.md

```text
Elijah Newren [ref] writes:

> On Tue, Nov 30, 2021 at 6:49 AM Junio C Hamano [ref] 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?
>
> I resubmitted it before you added this question, and have pointed out
> the resubmission in response to the past "What's cooking" emails, but
> perhaps it'll be easier for me to just resubmit with no changes.  I'll
> do that.

Thanks.  Yes, for anything that is older than a month, it always is
easier that way.
```