Re: [PATCH] mergetool: do not enable hideResolved by default

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mar 12, 2021, 23:29 UTC
Message-ID: <YEv5d0pGvEVpepoY@google.com>
In-Reply-To: <xmqqlfas55mk.fsf@gitster.g>

Junio C Hamano wrote:

> Junio C Hamano <gitster@pobox.com> writes:
> > Junio C Hamano <gitster@pobox.com> writes:

Show 8 quoted lines

>>> As we want to disable the feature for any backend when the user does
>>> not explicitly say the feature is wanted (either in general, or for
>>> a specific backend), the change in the above hunk is exactly want we
>>> want to see.
>>>
>>> Looking good.  Let's not revert the series and disable by default.
>>>
>>> Should I expect an updated log message, though?

[...]

>> For tonight's pushout, I'll use the patch as-is and merge it in
>> 'seen'.
>
> Any progress here?

Sorry for the delay. I should be able to send out an improved log message (more concise and summarizing the supporting info from this thread) later this afternoon.

Thanks, Jonathan