svn-scm icon indicating copy to clipboard operation
svn-scm copied to clipboard

When the conflict position is the bottom line of the file

Open junxxzz opened this issue 1 year ago • 0 comments
trafficstars

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)

junxxzz avatar Mar 15 '24 08:03 junxxzz