scm: conflict both modified showing in tab when there are no conflicts

[Tyriar]

Not sure how I got into this state, but I'm pretty sure it's wrong:

git output:

git.log

[lszomoru]

Looking at the graph I see that the third commit from a top is a merge commit where you merged main into your topic branch. Were there any conflicts when you have done the merge? Did you resolve those merge conflicts using the code lenses or the 3-ways merge editor?

[Tyriar]

Were there any conflicts when you have done the merge?

There were ~5

Did you resolve those merge conflicts using the code lenses or the 3-ways merge editor?

I resolved them like I always do by searching for >>> and manually resolving it; I disable code lens and rarely use the merge editor.