On 2025-03-22 at 23:16:49, Eugen Konkov wrote: > Hello Git, Hi, > Why merge conflict block is located at the wrong place? I think it's a little hard for us to comment on why this happens without a reproducible testcase. Do you perhaps have a public repository that you're working with that you can use to demonstrate this, or a shell script that shows the problem? -- brian m. carlson (they/them) Toronto, Ontario, CA
Attachment:
signature.asc
Description: PGP signature
