JohnstonCode / svn-scm

SVN support for VS Code
MIT License
208 stars 84 forks source link

When the conflict position is the bottom line of the file #1626

Open junxxzz opened 5 months ago

junxxzz commented 5 months ago

and, If the last line does not end with Enter

https://github.com/JohnstonCode/svn-scm/blob/2d3fdc10f8d7c5aa1384bab043be2b563a9388c9/src/commands/command.ts#L279

This regular expression does not match

So you can't see the code lens action.

we need more detail regxp.

my suggest => /^<{7} .working[^]+={7} .merge[^]+>{7} .merge/m.test(text)