Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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.
