Re: [PATCH v5 3/3] Retire the scripted difftool

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 19, 2017, 17:56 UTC
Message-ID: <xmqqlgu72asr.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <alpine.DEB.2.20.1701191730040.3469@virtualbox>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 11 quoted lines

>> Ok, I was mostly reacting to 2/3 while I am reading it:
>> 
>>     The reason: this new, experimental, builtin difftool will be shipped as
>>     part of Git for Windows v2.11.0, to allow for easier large-scale
>>     testing, but of course as an opt-in feature.
>> 
>> as there is no longer an opportunity to participate in this opt-in
>> testing, unless 3/3 is special cased and delayed.
>
> Yep, as Git for Windows v2.11.0 is yesteryear's news, it was probably
> obvious to you that I simply failed to spot and fix that oversight.

OK, if you want to tweak log message of either 2/3 or 3/3 to correct, there is still time, as they are still outside 'next'.

I am hoping we can merge it and others to 'next' by the end of the week, though.