On Tue, Jan 28, 2025 at 10:26:12AM -0800, Junio C Hamano wrote: > >> It has to be fixed in an evil merge of the two (or brian's rebased on > >> Adam's, which has since graduated to master). > > > > Thanks; I had this one on my radar and I thought there was a > > merge-fix I made somewhere, but it is likely to have been lost > > during shuffling the order of merges. Will take a look again. > > > > Thanks. > > Here is what I'd directly apply to 'next'. The merge-fix mechanism > knows about the same change, so when I merge the bc/doc-adoc-not-txt > topic down to 'master', the same tweak will be made as an evil > merge. Yeah, that looks perfect, thanks. -Peff
