From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Aug 2022 17:57:27 GMT
Subject: Re: [PATCH v3] git-prompt: show presence of unresolved conflicts at command prompt
Message-ID: <xmqq35dsm7zs.fsf@gitster.g>
In-Reply-To: <ps2p6366-7r7o-944q-o7s7-4rqp846721o9@tzk.qr>

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

> Hi Justin,
>
> On Wed, 17 Aug 2022, Justin Donnelly via GitGitGadget wrote:
> ...
>>     Changes since v2:
>>
>>      * There is now a single new test focused explicitly on this feature
>>        instead of making copies of existing tests and modifying them.
>>
>>     Changes since v1:
>>
>>      * This feature is now disabled by default.
>>      * Created new tests for conflict state (instead of modifying existing
>>        tests).
>
> This iteration looks good to me.

Thanks, both.  Will queue.