Support conflict-marker-size larger than 7

[sybereal]

conflict-marker-size is an attribute that allows overriding the length of conflict markers generated by Git. This PR adjusts the default regex patterns to support that scenario.

[rhysd]

Thanks. I didn't know this.

[sybereal]

What is the issue with matchit that this triggers? I have admittedly never tried using the jump feature.
Additionally, I am using https://github.com/andymass/vim-matchup instead of native matchit, and I don't know if that is affected by the same bug.

[rhysd]

The issue is that matchit.vim doesn't handle escaped , correctly in patterns. This change introduced , in pattern (e.g. ^>>>>>>> to ^>\{7,}) so it hit the issue.
I'll make an issue on vim/vim repository and link it to this. Note that 0e9686f is a temporary workaround for the issue. Once the issue is solved, I'll revert the revert commit again.

[sybereal]

Ah, I see. I can rewrite the expressions without , using + instead later, if that helps.

[rhysd]

Oh, that sounds a good idea I could not come up with. I'll try it.

[rhysd]

bdc226c

I applied the idea at the above commit. It is already committed to the main branch.

[sybereal]

Thank you for the swift response and resolution!