Re: [PATCH v3] git-prompt: show presence of unresolved conflicts at command prompt

Johannes Schindelin [off-list ref] writes:

Hi Justin,

On Wed, 17 Aug 2022, Justin Donnelly via GitGitGadget wrote:
...

quoted

    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.