On 19/05/2025 20:08, Patrick Steinhardt wrote: > On Mon, May 19, 2025 at 11:48:01AM -0700, Junio C Hamano wrote: >> Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> writes: >> >>> Again, I did a test merge to master@cb96e1697a, next@a128411c76 >>> and seen@df1b4f9cf9. The conflict which showed up in v1 against >>> the 'seen' branch now appears in the 'master' branch and has the >>> same resolution as v1. >> >> Thanks. >> >>> A range-diff against v3 is given below. >>> >>> [+] https://lore.kernel.org/git/aCrekcz6onTFgEWw@xxxxxx/ >>> >>> Changes in v3: >>> >>> Patch #3 changed as a result of Patrick's review [*]: >>> >>> - use the '/' magic string operator when setting the >>> ETC_GIT{CONFIG,ATTRIBUTES} build options. >>> - add the default values to the 'description' fields >>> for the 'gitconfig' and 'gitattributes' option >>> definitions >>> >>> Also, Junio, the range-diff below shows the typo fixup, but >>> you should find that it doesn't show for you this time. ;) >> >> OK. And changes in v4 are just that two redundant comments in the >> option definitions are removed, which makes sense looking at the >> discussion from the sidelines. >> >> Will queue. Are we done with this series by now? > > Yup, the range diff looks as expected, so this is ready to go from my > point of view. Thanks! Yes, I think we're good to go. Also, the 'make test' on cygwin just finished and passed without issue! :) Thanks. ATB, Ramsay Jones
